sr-dev December 2018

sr-dev@lists.kamailio.org

23 participants
313 discussions

Re: [sr-dev] [SR-Users] An error in msg_translator.c source file

by Henning Westerholt

Am Samstag, 29. Dezember 2018, 19:34:42 CET schrieb Mojtaba: > In msg_translator.c source file, goes to check_via_address function in line > 147, > In that function, the length of both ip in host(name) and host(ip) is just > checked in ipv6 (if condition section). the code are here: > > /* check if name->s is an ipv6 address or an ipv6 address ref. */ > if ((ip->af==AF_INET6) && > ( ((len==name->len)&&(strncasecmp(name->s, s, name->len)==0)) > > ((len==(name->len-2))&&(name->s[0]=='[')&& > (name->s[name->len-1]==']')&& > (strncasecmp(name->s+1, s, len)==0)) > ) > ) { > return 0; > } > else { > if (unlikely(name->s==NULL)) { > LM_CRIT("invalid Via host name\n"); > return -1; > } > > if (strncmp(name->s, s, name->len)==0) //I think the length > would be checked > return 0; > } Hello Mojtaba, thank you for the report. This looks indeed not correct. I fixed this today in git master (commit 98ee014a) and will also backport it. I wonder why this was not found earlier, this is a really old function. But most people probably use DNS names in their VIAs. Best regards, Henning > But in else section, the length does not check. I think it would be nice to > check . like this: > > if (len == name->len && strncmp(name->s, s, name->len)==0) > > Not actually, i am not referring to git master yet. I just want to know do > it would be nice or not? > With Regards.Mojtaba Esfandiari.S > > > > Does anybody know why the lenght of both ip-address (s and name) in > > > check_via_address function in msg_translator.c source file dose not > > > check first? > > > Actually i think it's better do. > > > For example if via:192.168.122.1 and src:192.168.122.100, the result > > > returned true, as they are not the same! > > > With.Regards. Mojtaba > > > > Hello Mojtaba, > > > > can you give more details, which line in e.g. git master are you referring > > to? -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://skalatan.de/services Kamailio security assessment - https://skalatan.de/de/assessment

5 years, 6 months

git:master:98ee014a: core: fix an error in check_via_address, reported from Mojtaba, mespio at gmail dot com

by Henning Westerholt

Module: kamailio Branch: master Commit: 98ee014a88ca951d82a0389f0be119078ba525f7 URL: https://github.com/kamailio/kamailio/commit/98ee014a88ca951d82a0389f0be1190… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-30T01:17:15+01:00 core: fix an error in check_via_address, reported from Mojtaba, mespio at gmail dot com - fix an error in check_via_address, reported from Mojtaba, mespio at gmail dot com - use the same logic for IPv4 string comparison as for IPv6 - the old comparison could return true for e.g. via="192.168.1.1", src="192.1.1.100" - the new logic is also faster for the trivial case with different string length --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/98ee014a88ca951d82a0389f0be1190… Patch: https://github.com/kamailio/kamailio/commit/98ee014a88ca951d82a0389f0be1190… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 3bb0dd7bba..c7851904c7 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -179,7 +179,7 @@ static int check_via_address(struct ip_addr* ip, str *name, LM_CRIT("invalid Via host name\n"); return -1; } - if (strncmp(name->s, s, name->len)==0) + if (len==name->len&&(strncmp(name->s, s, name->len)==0)) return 0; } }else{

5 years, 6 months

git:master:7eb1eae6: core: check for optarg before passing it to external library (coverity report)

by Henning Westerholt

Module: kamailio Branch: master Commit: 7eb1eae615a4c3ef710e9931b101ddc4db07aff2 URL: https://github.com/kamailio/kamailio/commit/7eb1eae615a4c3ef710e9931b101ddc… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-30T00:52:18+01:00 core: check for optarg before passing it to external library (coverity report) --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/7eb1eae615a4c3ef710e9931b101ddc… Patch: https://github.com/kamailio/kamailio/commit/7eb1eae615a4c3ef710e9931b101ddc… --- diff --git a/src/main.c b/src/main.c index ac58b760ba..be1405eeec 100644 --- a/src/main.c +++ b/src/main.c @@ -1908,6 +1908,10 @@ int main(int argc, char** argv) log_color=1; break; case 'M': + if (optarg == NULL) { + fprintf(stderr, "bad private mem size\n"); + goto error; + } pkg_mem_size=strtol(optarg, &tmp, 10) * 1024 * 1024; if (tmp &&(*tmp)){ fprintf(stderr, "bad private mem size number: -M %s\n",

5 years, 6 months

git:master:967a7168: cdp: fix three coverity errors (ressource leaks and error checks)

by Henning Westerholt

Module: kamailio Branch: master Commit: 967a71687aa63a253d495ba49351ae916713a452 URL: https://github.com/kamailio/kamailio/commit/967a71687aa63a253d495ba49351ae9… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-30T00:42:31+01:00 cdp: fix three coverity errors (ressource leaks and error checks) - fix an ressource leak related to library call getaddrinfo - add missing error checks for setsockopts and fcntl calls --- Modified: src/modules/cdp/receiver.c --- Diff: https://github.com/kamailio/kamailio/commit/967a71687aa63a253d495ba49351ae9… Patch: https://github.com/kamailio/kamailio/commit/967a71687aa63a253d495ba49351ae9… --- diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c index 6257d15362..c33554457a 100644 --- a/src/modules/cdp/receiver.c +++ b/src/modules/cdp/receiver.c @@ -844,6 +844,7 @@ int receive_loop(peer *original_peer) int peer_connect(peer *p) { int sock; + int tmp = 0; unsigned int option = 1; struct addrinfo *ainfo=0,*res=0,*sainfo=0,hints; @@ -935,10 +936,21 @@ int peer_connect(peer *p) } x=fcntl(sock,F_GETFL,0); - fcntl(sock,F_SETFL,x & (~O_NONBLOCK)); + if (x == -1) { + LM_ERR("error during first fcntl operation\n"); + goto error; + } + tmp = fcntl(sock,F_SETFL,x & (~O_NONBLOCK)); + if (tmp == -1) { + LM_ERR("error during second fcntl operation\n"); + goto error; + } + } + tmp = setsockopt(sock,SOL_SOCKET,SO_REUSEADDR,&option,sizeof(option)); + if (tmp == -1) { + LM_ERR("could not set socket options\n"); + goto error; } - setsockopt(sock,SOL_SOCKET,SO_REUSEADDR,&option,sizeof(option)); - LM_INFO("peer_connect(): Peer %.*s:%d connected\n",p->fqdn.len,p->fqdn.s,p->port); if (!send_fd(p->fd_exchange_pipe,sock,p)){ @@ -948,10 +960,12 @@ int peer_connect(peer *p) } if (res) freeaddrinfo(res); + if (sainfo) freeaddrinfo(sainfo); return sock; } error: if (res) freeaddrinfo(res); + if (sainfo) freeaddrinfo(sainfo); return -1; }

5 years, 6 months

git:master:14975b6e: cdp: fix a coverity scan error, duplicated code for logical statement

by Henning Westerholt

Module: kamailio Branch: master Commit: 14975b6e7e028aea9db198c64b65526fb9bd20b7 URL: https://github.com/kamailio/kamailio/commit/14975b6e7e028aea9db198c64b65526… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-30T00:41:58+01:00 cdp: fix a coverity scan error, duplicated code for logical statement --- Modified: src/modules/cdp/session.c --- Diff: https://github.com/kamailio/kamailio/commit/14975b6e7e028aea9db198c64b65526… Patch: https://github.com/kamailio/kamailio/commit/14975b6e7e028aea9db198c64b65526… --- diff --git a/src/modules/cdp/session.c b/src/modules/cdp/session.c index dd5c026e3e..60e97becae 100644 --- a/src/modules/cdp/session.c +++ b/src/modules/cdp/session.c @@ -607,8 +607,8 @@ AAASession* cdp_new_cc_acc_session(str id, int is_statefull) AAASession *s; cdp_session_type_t type; - if (is_statefull) type = ACCT_CC_CLIENT; - else type = ACCT_CC_CLIENT; //for now everything will be supported through this SM (until we add IEC) + //for now everything will be supported through this SM (until we add IEC) + type = ACCT_CC_CLIENT; s = cdp_new_session(id,type); if (s) {

5 years, 6 months

git:master:7d52bf6c: cdp: fix two errors from coverty scan (missing check, var initialization)

by Henning Westerholt

Module: kamailio Branch: master Commit: 7d52bf6ce7188eaa57690766c231e55b5509db4f URL: https://github.com/kamailio/kamailio/commit/7d52bf6ce7188eaa57690766c231e55… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-30T00:15:46+01:00 cdp: fix two errors from coverty scan (missing check, var initialization) - remove library call can fail, test for the error and log it - initialize the msghdr variable with a memset --- Modified: src/modules/cdp/receiver.c --- Diff: https://github.com/kamailio/kamailio/commit/7d52bf6ce7188eaa57690766c231e55… Patch: https://github.com/kamailio/kamailio/commit/7d52bf6ce7188eaa57690766c231e55… --- diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c index 2b4da266e3..6257d15362 100644 --- a/src/modules/cdp/receiver.c +++ b/src/modules/cdp/receiver.c @@ -157,10 +157,14 @@ static int make_send_pipe(serviced_peer_t *sp) */ static void close_send_pipe(serviced_peer_t *sp) { + int tmp; if (sp->send_pipe_name.s) { close(sp->send_pipe_fd); close(sp->send_pipe_fd_out); - remove(sp->send_pipe_name.s); + tmp = remove(sp->send_pipe_name.s); + if (tmp == -1) { + LM_ERR("could not remove send pipe\n"); + } shm_free(sp->send_pipe_name.s); sp->send_pipe_name.s=0; sp->send_pipe_name.len=0; @@ -269,6 +273,7 @@ static int send_fd(int pipe_fd,int fd, peer *p) struct iovec iov[1]; int ret; int *tmp = NULL; + memset(&msg, 0, sizeof(struct msghdr)); #ifdef HAVE_MSGHDR_MSG_CONTROL struct cmsghdr* cmsg;

5 years, 6 months

A bit trick in msg_translator.c source file

by Mojtaba

Hello , Does anybody know why the lenght of both ip-address (s and name) in check_via_address function in msg_translator.c source file dose not check first? Actually i think it's better do. For example if via:192.168.122.1 and src:192.168.122.100, the result returned true, as they are not the same! With.Regards. Mojtaba Happy new year --Mojtaba Esfandiari.S

5 years, 6 months

PKG/SHM allocation failure log macros

by Daniel-Constantin Mierla

Hello, I noticed many commits replacing the log messages in case of allocation failure with some macros. That is good, bringing consistency, but I think that we should offer couple of them. The current one is rather dry (meaning that it offers very few context details), which matches most of the existing log messages used in such cases. But there are also other log messages for such cases which give more details, like for what the allocation fails, some also giving the requested size of allocation. So besides the current two macros (one for shm and one for pkg), we should add few more. Like: #define PKG_MEM_ERROR_MSG(m) LM_ERR("could not allocate private memory from pkg pool - %s\n", m); So one can do: PKG_MEM_ERROR_MSG("needed for htable struct"); And one to include also the size: #define PKG_MEM_ERROR_SZ(s, m) LM_ERR("could not allocate private memory from pkg pool - size: %u - %s\n", (unsigned int)s, m); No need to revert what was done, but I think for the future we would preserve better information for troubleshooting in some cases, instead of replacing those messages that now have more details with the bare error log message. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference - May 6-8, 2019 -- www.kamailioworld.com Kamailio Advanced Training - Mar 4-6, 2019 in Berlin; Mar 25-27, 2019, in Washington, DC, USA -- www.asipto.com

5 years, 6 months

git:master:ccb77f2d: core: remove wrongly commited out-commented statement from pkg.h

by Henning Westerholt

Module: kamailio Branch: master Commit: ccb77f2d7f69d6a2f309ea7c4f16ba6892a4785a URL: https://github.com/kamailio/kamailio/commit/ccb77f2d7f69d6a2f309ea7c4f16ba6… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-29T01:58:25+01:00 core: remove wrongly commited out-commented statement from pkg.h --- Modified: src/core/mem/pkg.h --- Diff: https://github.com/kamailio/kamailio/commit/ccb77f2d7f69d6a2f309ea7c4f16ba6… Patch: https://github.com/kamailio/kamailio/commit/ccb77f2d7f69d6a2f309ea7c4f16ba6… --- diff --git a/src/core/mem/pkg.h b/src/core/mem/pkg.h index 147208698f..6dad39f360 100644 --- a/src/core/mem/pkg.h +++ b/src/core/mem/pkg.h @@ -134,7 +134,6 @@ void pkg_print_manager(void); #define PKG_MEM_CRITICAL LM_CRIT("could not allocate private memory from pkg pool\n") #ifdef __SUNPRO_C -//#define PKG_MEM_ERROR_FMT(...) LM_ERR("could not allocate private memory from pkg pool", __VA_ARGS__) #define PKG_MEM_ERROR_FMT(...) LM_ERR("could not allocate private memory from pkg pool" __VA_ARGS__) #define PKG_MEM_CRITICAL_FMT(...) LM_CRIT("could not allocate private memory from pkg pool" __VA_ARGS__) #else

5 years, 6 months

git:master:d3b3e87a: core: refactor PKG, SHM, and SYS* memory allocation error logging helper #defines

by Henning Westerholt

Module: kamailio Branch: master Commit: d3b3e87a2d39992d1da291f552869f14375425de URL: https://github.com/kamailio/kamailio/commit/d3b3e87a2d39992d1da291f552869f1… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-29T01:50:19+01:00 core: refactor PKG, SHM, and SYS* memory allocation error logging helper #defines - refactor PKG, SHM, and SYS* memory allocation error logging helper #defines - replace *_SZ and *_MSG by *_FTM #defines, which accept variable parameters - usage example: PKG_MEM_ERROR_FMT("for the record index %d\n", i); - output: "could not allocate private memory from pkg pool - for the record index 2" - because of the variable parameters you need to add a '\n' at the end --- Modified: src/core/mem/pkg.h Modified: src/core/mem/shm.h --- Diff: https://github.com/kamailio/kamailio/commit/d3b3e87a2d39992d1da291f552869f1… Patch: https://github.com/kamailio/kamailio/commit/d3b3e87a2d39992d1da291f552869f1…

5 years, 6 months

← Newer
1
...
6
7
8
9
10
11
12
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2018