sr-dev December 2018

sr-dev@lists.kamailio.org

23 participants
314 discussions

[kamailio/kamailio] topoh: fixed unmask route issue, if maksing fails for one of the routes (#1776)
by balajeesv 07 Jan '19

07 Jan '19

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Kamailio topoh module fails to unmask route headers under following scenario 1. uri_prefix_checks disabled 2. mask_ip configured same as public ip of kamailio host 3. interworking between tcp and udp In this case two record-route headers are added by kamailio for the current host (during tcp to udp conversion). But second record-route is not encoded while sending response to client, but trying to decode second Route on next request from client. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1776 -- Commit Summary -- * topoh: fixed unmask route issue, if maksing fails for one of the routes -- File Changes -- M src/modules/topoh/th_msg.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1776.patch https://github.com/kamailio/kamailio/pull/1776.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1776

2 4

git:5.2:ddc0073c: cdp: fix two errors from coverty scan (missing check, var initialization)
by Henning Westerholt 30 Dec '18

30 Dec '18

Module: kamailio Branch: 5.2 Commit: ddc0073c64df5ea1817ce2f727ea7c5e0b46b5ed URL: https://github.com/kamailio/kamailio/commit/ddc0073c64df5ea1817ce2f727ea7c5… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-30T18:42:45+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 (cherry picked from commit 7d52bf6ce7188eaa57690766c231e55b5509db4f) --- Modified: src/modules/cdp/receiver.c --- Diff: https://github.com/kamailio/kamailio/commit/ddc0073c64df5ea1817ce2f727ea7c5… Patch: https://github.com/kamailio/kamailio/commit/ddc0073c64df5ea1817ce2f727ea7c5… --- diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c index 4278bde951..c33554457a 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;

1 0

git:5.2:fb989491: cdp: fix three coverity errors (ressource leaks and error checks)
by Henning Westerholt 30 Dec '18

30 Dec '18

Module: kamailio Branch: 5.2 Commit: fb9894915bba17927ef6edd69a0b8606ac109a53 URL: https://github.com/kamailio/kamailio/commit/fb9894915bba17927ef6edd69a0b860… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-30T18:42:28+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 (cherry picked from commit 967a71687aa63a253d495ba49351ae916713a452) --- Modified: src/modules/cdp/receiver.c --- Diff: https://github.com/kamailio/kamailio/commit/fb9894915bba17927ef6edd69a0b860… Patch: https://github.com/kamailio/kamailio/commit/fb9894915bba17927ef6edd69a0b860… --- diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c index 2b4da266e3..4278bde951 100644 --- a/src/modules/cdp/receiver.c +++ b/src/modules/cdp/receiver.c @@ -839,6 +839,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; @@ -930,10 +931,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)){ @@ -943,10 +955,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; }

1 0

git:5.2:aeaf35ce: core: check for optarg before passing it to external library (coverity report)
by Henning Westerholt 30 Dec '18

30 Dec '18

Module: kamailio Branch: 5.2 Commit: aeaf35ce1f19dc46436102a2763a8e9a4d1db1b7 URL: https://github.com/kamailio/kamailio/commit/aeaf35ce1f19dc46436102a2763a8e9… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-30T18:42:05+01:00 core: check for optarg before passing it to external library (coverity report) (cherry picked from commit 7eb1eae615a4c3ef710e9931b101ddc4db07aff2) --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/aeaf35ce1f19dc46436102a2763a8e9… Patch: https://github.com/kamailio/kamailio/commit/aeaf35ce1f19dc46436102a2763a8e9… --- diff --git a/src/main.c b/src/main.c index b7e9fdb58a..13c47a0852 100644 --- a/src/main.c +++ b/src/main.c @@ -1889,6 +1889,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",

1 0

git:5.2:eed2a7f8: core: fix an error in check_via_address, reported from Mojtaba, mespio at gmail dot com
by Henning Westerholt 30 Dec '18

30 Dec '18

Module: kamailio Branch: 5.2 Commit: eed2a7f86129950e5f20a4b4010a7e67ea04eac5 URL: https://github.com/kamailio/kamailio/commit/eed2a7f86129950e5f20a4b4010a7e6… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-30T18:41:44+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 (cherry picked from commit 98ee014a88ca951d82a0389f0be119078ba525f7) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/eed2a7f86129950e5f20a4b4010a7e6… Patch: https://github.com/kamailio/kamailio/commit/eed2a7f86129950e5f20a4b4010a7e6… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 08e518a9d8..038b02f461 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{

1 0

git:5.1:b5f12075: cdp: fix two errors from coverty scan (missing check, var initialization)
by Henning Westerholt 30 Dec '18

30 Dec '18

Module: kamailio Branch: 5.1 Commit: b5f12075497cf2ab6bcfc71ab2550198065e7e87 URL: https://github.com/kamailio/kamailio/commit/b5f12075497cf2ab6bcfc71ab255019… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-30T18:42:41+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 (cherry picked from commit 7d52bf6ce7188eaa57690766c231e55b5509db4f) --- Modified: src/modules/cdp/receiver.c --- Diff: https://github.com/kamailio/kamailio/commit/b5f12075497cf2ab6bcfc71ab255019… Patch: https://github.com/kamailio/kamailio/commit/b5f12075497cf2ab6bcfc71ab255019… --- diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c index 46a16be650..2710387d29 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;

1 0

git:5.1:977057fb: cdp: fix three coverity errors (ressource leaks and error checks)
by Henning Westerholt 30 Dec '18

30 Dec '18

Module: kamailio Branch: 5.1 Commit: 977057fb98ecd72844a0441e1f890378369e4862 URL: https://github.com/kamailio/kamailio/commit/977057fb98ecd72844a0441e1f89037… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-30T18:42:24+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 (cherry picked from commit 967a71687aa63a253d495ba49351ae916713a452) --- Modified: src/modules/cdp/receiver.c --- Diff: https://github.com/kamailio/kamailio/commit/977057fb98ecd72844a0441e1f89037… Patch: https://github.com/kamailio/kamailio/commit/977057fb98ecd72844a0441e1f89037… --- diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c index 0ff2fe15ae..46a16be650 100644 --- a/src/modules/cdp/receiver.c +++ b/src/modules/cdp/receiver.c @@ -839,6 +839,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; @@ -930,10 +931,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)){ @@ -943,10 +955,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; }

1 0

git:5.1:5d738714: core: check for optarg before passing it to external library (coverity report)
by Henning Westerholt 30 Dec '18

30 Dec '18

Module: kamailio Branch: 5.1 Commit: 5d738714cb95edbf119462553d16be547117355e URL: https://github.com/kamailio/kamailio/commit/5d738714cb95edbf119462553d16be5… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-30T18:41:57+01:00 core: check for optarg before passing it to external library (coverity report) (cherry picked from commit 7eb1eae615a4c3ef710e9931b101ddc4db07aff2) --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/5d738714cb95edbf119462553d16be5… Patch: https://github.com/kamailio/kamailio/commit/5d738714cb95edbf119462553d16be5… --- diff --git a/src/main.c b/src/main.c index dd33b89a75..f26aea8561 100644 --- a/src/main.c +++ b/src/main.c @@ -1887,6 +1887,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",

1 0

git:5.1:b075e6fc: core: fix an error in check_via_address, reported from Mojtaba, mespio at gmail dot com
by Henning Westerholt 30 Dec '18

30 Dec '18

Module: kamailio Branch: 5.1 Commit: b075e6fcb7435d168241bc9bc83e87b70b4d08d4 URL: https://github.com/kamailio/kamailio/commit/b075e6fcb7435d168241bc9bc83e87b… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-12-30T18:41:39+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 (cherry picked from commit 98ee014a88ca951d82a0389f0be119078ba525f7) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/b075e6fcb7435d168241bc9bc83e87b… Patch: https://github.com/kamailio/kamailio/commit/b075e6fcb7435d168241bc9bc83e87b… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 5b0c726378..f34637b6f1 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -176,7 +176,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{

1 0

git:master:ddaebe5c: secfilter: init vars to avoid unitialized usage
by Daniel-Constantin Mierla 30 Dec '18

30 Dec '18

Module: kamailio Branch: master Commit: ddaebe5ce4e903a28ab97339a4f9bcf14ca3cbf4 URL: https://github.com/kamailio/kamailio/commit/ddaebe5ce4e903a28ab97339a4f9bcf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-12-30T18:03:07+01:00 secfilter: init vars to avoid unitialized usage --- Modified: src/modules/secfilter/secfilter.c --- Diff: https://github.com/kamailio/kamailio/commit/ddaebe5ce4e903a28ab97339a4f9bcf… Patch: https://github.com/kamailio/kamailio/commit/ddaebe5ce4e903a28ab97339a4f9bcf… --- diff --git a/src/modules/secfilter/secfilter.c b/src/modules/secfilter/secfilter.c index 37b1ededfd..0111792214 100644 --- a/src/modules/secfilter/secfilter.c +++ b/src/modules/secfilter/secfilter.c @@ -401,12 +401,12 @@ Return codes: */ static int check_user(struct sip_msg *msg, int type) { - str name; - str user; - str domain; + str name = STR_NULL; + str user = STR_NULL; + str domain = STR_NULL; int res = 0; int nlen, ulen, dlen; - struct str_list *list; + struct str_list *list = NULL; switch(type) { case 1:

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2018