sr-dev November 2016

sr-dev@lists.kamailio.org

27 participants
289 discussions

git:master:76e2a0dd: rtpengine: init all struct to get rid of compile warnings

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 76e2a0dd05aa1a6fb3148c231d57cd2278ced9d2 URL: https://github.com/kamailio/kamailio/commit/76e2a0dd05aa1a6fb3148c231d57cd2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-03T08:47:01+01:00 rtpengine: init all struct to get rid of compile warnings --- Modified: modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/76e2a0dd05aa1a6fb3148c231d57cd2… Patch: https://github.com/kamailio/kamailio/commit/76e2a0dd05aa1a6fb3148c231d57cd2… --- diff --git a/modules/rtpengine/rtpengine.c b/modules/rtpengine/rtpengine.c index a3787eb..6b46074 100644 --- a/modules/rtpengine/rtpengine.c +++ b/modules/rtpengine/rtpengine.c @@ -593,8 +593,7 @@ static inline int str_eq(const str *p, const char *q) { } static inline str str_prefix(const str *p, const char *q) { - str ret; - ret.s = NULL; + str ret = STR_NULL; int l = strlen(q); if (p->len < l) return ret;

7 years, 6 months

git:master:0cc0b643: lib/binrpc: memset addr variable to avoind uninitialized fields

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0cc0b643ee6442a13f257e3d72b826f257501204 URL: https://github.com/kamailio/kamailio/commit/0cc0b643ee6442a13f257e3d72b826f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-03T08:50:13+01:00 lib/binrpc: memset addr variable to avoind uninitialized fields --- Modified: lib/binrpc/binrpc_api.c --- Diff: https://github.com/kamailio/kamailio/commit/0cc0b643ee6442a13f257e3d72b826f… Patch: https://github.com/kamailio/kamailio/commit/0cc0b643ee6442a13f257e3d72b826f… --- diff --git a/lib/binrpc/binrpc_api.c b/lib/binrpc/binrpc_api.c index 9145758..30cc003 100644 --- a/lib/binrpc/binrpc_api.c +++ b/lib/binrpc/binrpc_api.c @@ -13,11 +13,11 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ - + /** * send commands using binrpc * @@ -67,7 +67,7 @@ static void (*internal_free)(void* ptr) = free; static char binrpc_last_errs[1024] = ""; static int verbose = 0; -char *binrpc_get_last_errs() +char *binrpc_get_last_errs() { return binrpc_last_errs; } @@ -213,28 +213,29 @@ static int connect_tcpudp_socket(char* address, int port, int type) struct sockaddr_in addr; struct hostent* he; int sock; - + sock=-1; /* resolve destination */ he=gethostbyname(address); if (he==0){ - snprintf(binrpc_last_errs, sizeof(binrpc_last_errs)-1, + snprintf(binrpc_last_errs, sizeof(binrpc_last_errs)-1, "connect_tcpudp_socket: could not resolve %s", address); goto error; } /* open socket*/ + memset(&addr, 0, sizeof(struct sockaddr_in)); addr.sin_family=he->h_addrtype; addr.sin_port=htons(port); memcpy(&addr.sin_addr.s_addr, he->h_addr_list[0], he->h_length); - + sock = socket(he->h_addrtype, type, 0); if (sock==-1){ - snprintf(binrpc_last_errs, sizeof(binrpc_last_errs)-1, + snprintf(binrpc_last_errs, sizeof(binrpc_last_errs)-1, "connect_tcpudp_socket: socket: %s", strerror(errno)); goto error; } if (connect(sock, (struct sockaddr*) &addr, sizeof(struct sockaddr))!=0){ - snprintf(binrpc_last_errs, sizeof(binrpc_last_errs)-1, + snprintf(binrpc_last_errs, sizeof(binrpc_last_errs)-1, "connect_tcpudp_socket: connect: %s", strerror(errno)); goto error; } @@ -246,7 +247,7 @@ static int connect_tcpudp_socket(char* address, int port, int type) /* on exit cleanup */ static void cleanup(struct sockaddr_un* mysun) -{ +{ if (mysun->sun_path[0] != '\0') { if (unlink(mysun->sun_path) < 0) { fprintf(stderr, "ERROR: failed to delete %s: %s\n", @@ -259,7 +260,7 @@ int binrpc_open_connection(struct binrpc_handle* handle, char* name, int port, i char* reply_socket, char* sock_dir) { struct sockaddr_un mysun; - + binrpc_last_errs[0] = '\0'; binrpc_last_errs[sizeof(binrpc_last_errs)-1] = '\0'; /* snprintf safe terminator */

7 years, 6 months

git:master:f609a83e: mi_rpc: init structures to avoid access to invalid content in case of errors

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f609a83e58eccae409a5966a002edba389bbc372 URL: https://github.com/kamailio/kamailio/commit/f609a83e58eccae409a5966a002edba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T23:37:43+01:00 mi_rpc: init structures to avoid access to invalid content in case of errors --- Modified: modules/mi_rpc/mi_rpc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f609a83e58eccae409a5966a002edba… Patch: https://github.com/kamailio/kamailio/commit/f609a83e58eccae409a5966a002edba… --- diff --git a/modules/mi_rpc/mi_rpc_mod.c b/modules/mi_rpc/mi_rpc_mod.c index 32d444f..718aab8 100644 --- a/modules/mi_rpc/mi_rpc_mod.c +++ b/modules/mi_rpc/mi_rpc_mod.c @@ -496,25 +496,28 @@ static struct mi_root* mi_run_rpc(struct mi_root* cmd_tree, void* param) struct binrpc_handle rpc_handle; struct binrpc_response_handle resp_handle; int i; - + str *fn; struct mi_node *node; char *command = NULL; int param_count = 0; char **parameters = NULL; struct mi_root* result; - + int resp_type; int resp_code; char *resp; - /* response will be malloced by binrpc_response_to_text. + /* response will be malloced by binrpc_response_to_text. We do not free it. It must remain after this call. It will be reused by subsequent calls */ static unsigned char *response = NULL; static int resp_len = 0; - - if (binrpc_open_connection_url(&rpc_handle, rpc_url) != 0) + + memset(&rpc_handle, 0, sizeof(struct binrpc_handle)); + memset(&resp_handle, 0, sizeof(struct binrpc_response_handle)); + + if (binrpc_open_connection_url(&rpc_handle, rpc_url) != 0) { LM_ERR( "Open connect to %s failed\n", rpc_url); result = init_mi_tree( 500, (char *)CONNECT_FAILED, strlen(CONNECT_FAILED) ); @@ -527,12 +530,12 @@ static struct mi_root* mi_run_rpc(struct mi_root* cmd_tree, void* param) return( init_mi_tree( 400, MI_MISSING_PARM_S, MI_MISSING_PARM_LEN )); fn = &node->value; - + /* find_rpc_exports needs 0 terminated strings */ command = pkg_malloc(fn->len+1); memcpy(command, fn->s, fn->len); command[fn->len] = '\0'; - + /* Count the parameters. */ node = node->next; while (node) { @@ -564,9 +567,9 @@ static struct mi_root* mi_run_rpc(struct mi_root* cmd_tree, void* param) result = init_mi_tree( 500, (char *)FAILED, strlen(FAILED) ); goto end; } - + resp_type = binrpc_get_response_type(&resp_handle); - + /* If we already have a buffer make it NULL terminated to discard any previous content */ if (resp_len > 0) response[0]='\0'; @@ -582,12 +585,12 @@ static struct mi_root* mi_run_rpc(struct mi_root* cmd_tree, void* param) /* Some functions don't give a text answer; use a default */ result = init_mi_tree( 200, MI_OK_S, MI_OK_LEN ); break; - + case 1: /* Valid failure */ binrpc_parse_error_response(&resp_handle, &resp_code, &resp); if (resp_len < strlen(resp) + 1) - { + { if (resp_len==0) response = malloc(strlen(resp) + 1); else @@ -601,7 +604,7 @@ static struct mi_root* mi_run_rpc(struct mi_root* cmd_tree, void* param) /* Some functions don't give a text answer; use a default */ result = init_mi_tree( resp_code, (char *)FAILED, strlen(FAILED) ); break; - + default: result = init_mi_tree( 500, (char *)FAILED, strlen(FAILED) ); goto end; @@ -610,7 +613,7 @@ static struct mi_root* mi_run_rpc(struct mi_root* cmd_tree, void* param) end: if (param_count > 0) { - for (i=0; i<param_count; i++) + for (i=0; i<param_count; i++) { pkg_free(parameters[i]); }

7 years, 6 months

git:master:66bb1a55: mi_fifo: close fifo stream in case of errors

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 66bb1a55f4e1b6e8dbfd8fbc3c6625e356daa734 URL: https://github.com/kamailio/kamailio/commit/66bb1a55f4e1b6e8dbfd8fbc3c6625e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T23:23:20+01:00 mi_fifo: close fifo stream in case of errors --- Modified: modules/mi_fifo/fifo_fnc.c --- Diff: https://github.com/kamailio/kamailio/commit/66bb1a55f4e1b6e8dbfd8fbc3c6625e… Patch: https://github.com/kamailio/kamailio/commit/66bb1a55f4e1b6e8dbfd8fbc3c6625e… --- diff --git a/modules/mi_fifo/fifo_fnc.c b/modules/mi_fifo/fifo_fnc.c index aa0df20..1d33bf2 100644 --- a/modules/mi_fifo/fifo_fnc.c +++ b/modules/mi_fifo/fifo_fnc.c @@ -108,15 +108,18 @@ FILE *mi_init_fifo_server(char *fifo_name, int mi_fifo_mode, mi_fifo_write=open( fifo_name, O_WRONLY|O_NONBLOCK, 0); if (mi_fifo_write<0) { LM_ERR("fifo_write did not open: %s\n", strerror(errno)); + fclose(fifo_stream); return 0; } /* set read fifo blocking mode */ if ((opt=fcntl(mi_fifo_read, F_GETFL))==-1){ LM_ERR("fcntl(F_GETFL) failed: %s [%d]\n", strerror(errno), errno); + fclose(fifo_stream); return 0; } if (fcntl(mi_fifo_read, F_SETFL, opt & (~O_NONBLOCK))==-1){ LM_ERR("cntl(F_SETFL) failed: %s [%d]\n", strerror(errno), errno); + fclose(fifo_stream); return 0; } @@ -125,6 +128,7 @@ FILE *mi_init_fifo_server(char *fifo_name, int mi_fifo_mode, reply_fifo_s = pkg_malloc(MAX_MI_FILENAME); if ( mi_buf==NULL|| reply_fifo_s==NULL) { LM_ERR("no more private memory\n"); + fclose(fifo_stream); return 0; } @@ -146,7 +150,7 @@ static int mi_fifo_check(int fd, char* fname) { struct stat fst; struct stat lst; - + if (fstat(fd, &fst)<0){ LM_ERR("security: fstat on %s failed: %s\n", fname, strerror(errno)); return -1; @@ -200,7 +204,7 @@ static FILE *mi_open_reply_pipe( char *pipe_name ) } tryagain: - /* open non-blocking to make sure that a broken client will not + /* open non-blocking to make sure that a broken client will not * block the FIFO server forever */ fifofd=open( pipe_name, O_WRONLY | O_NONBLOCK ); if (fifofd==-1) { @@ -225,7 +229,7 @@ static FILE *mi_open_reply_pipe( char *pipe_name ) return 0; } - /* security checks: is this really a fifo?, is + /* security checks: is this really a fifo?, is * it hardlinked? is it a soft link? */ if (mi_fifo_check(fifofd, pipe_name)<0) goto error; @@ -280,7 +284,7 @@ int mi_read_line( char *b, int max, FILE *stream, int *read) kill(0, SIGTERM); } /* if we did not read whole line, our buffer is too small - and we cannot process the request; consume the remainder of + and we cannot process the request; consume the remainder of request */

7 years, 6 months

git:master:aeb9b5af: ctl: proper trim for long error messages to avoid out of bounds access

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: aeb9b5af7099ef3f8d3df02dcde1617fe22e4e46 URL: https://github.com/kamailio/kamailio/commit/aeb9b5af7099ef3f8d3df02dcde1617… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T23:18:00+01:00 ctl: proper trim for long error messages to avoid out of bounds access --- Modified: modules/ctl/binrpc_run.c --- Diff: https://github.com/kamailio/kamailio/commit/aeb9b5af7099ef3f8d3df02dcde1617… Patch: https://github.com/kamailio/kamailio/commit/aeb9b5af7099ef3f8d3df02dcde1617… --- diff --git a/modules/ctl/binrpc_run.c b/modules/ctl/binrpc_run.c index 5bdd869..e0d480f 100644 --- a/modules/ctl/binrpc_run.c +++ b/modules/ctl/binrpc_run.c @@ -503,7 +503,7 @@ static int rpc_fault_prepare(struct binrpc_ctx* ctx, int code, char* fmt, ...) } va_start(ap, fmt); len=vsnprintf(buf, MAX_FAULT_LEN, fmt, ap); /* ignore trunc. errors */ - if ((len<0) || (len > MAX_FAULT_LEN)) + if ((len<0) || (len >= MAX_FAULT_LEN)) len=MAX_FAULT_LEN-1; va_end(ap);

7 years, 6 months

[kamailio/kamailio] Fix/free bsd makefile (#844)

by Rick

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/844 -- Commit Summary -- * uri_db: added optional parameter for username and realm to check_uri * Makefile.defs: clang as default and lib for 64 bit on FreeBSD -- File Changes -- M Makefile.defs (13) M modules/uri_db/checks.c (169) M modules/uri_db/checks.h (5) M modules/uri_db/uri_db.c (16) -- Patch Links -- https://github.com/kamailio/kamailio/pull/844.patch https://github.com/kamailio/kamailio/pull/844.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/844

7 years, 6 months

git:master:ef4d771a: debugger: re-order loop condition to avoid out of bounds access

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ef4d771a2511ba6c288d85c6312ea25990a76669 URL: https://github.com/kamailio/kamailio/commit/ef4d771a2511ba6c288d85c6312ea25… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-02T21:04:10+01:00 debugger: re-order loop condition to avoid out of bounds access --- Modified: modules/debugger/debugger_json.c --- Diff: https://github.com/kamailio/kamailio/commit/ef4d771a2511ba6c288d85c6312ea25… Patch: https://github.com/kamailio/kamailio/commit/ef4d771a2511ba6c288d85c6312ea25… --- diff --git a/modules/debugger/debugger_json.c b/modules/debugger/debugger_json.c index 3d9150c..2cdadc4 100644 --- a/modules/debugger/debugger_json.c +++ b/modules/debugger/debugger_json.c @@ -93,7 +93,7 @@ int _dbg_xavp_dump_lookup(pv_param_t *param) xname = (pv_xavp_name_t*)param->pvn.u.dname; - while(_dbg_xavp_dump[i]!=NULL&&i<DBG_XAVP_DUMP_SIZE) + while(i<DBG_XAVP_DUMP_SIZE && _dbg_xavp_dump[i]!=NULL) { if(_dbg_xavp_dump[i]->len==xname->name.len) {

7 years, 6 months

git:master:c73a7eab: janssonrpc-c: fix double free introduced by

by Emmanuel Schmidbauer

Module: kamailio Branch: master Commit: c73a7eab210c7806c9d5fadacac1d3acc0ad6580 URL: https://github.com/kamailio/kamailio/commit/c73a7eab210c7806c9d5fadacac1d3a… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Date: 2016-11-02T13:18:15-04:00 janssonrpc-c: fix double free introduced by cf8d6066afc102d5904dddec0275079885f0ead1 --- Modified: modules/janssonrpc-c/janssonrpc_io.c --- Diff: https://github.com/kamailio/kamailio/commit/c73a7eab210c7806c9d5fadacac1d3a… Patch: https://github.com/kamailio/kamailio/commit/c73a7eab210c7806c9d5fadacac1d3a… --- diff --git a/modules/janssonrpc-c/janssonrpc_io.c b/modules/janssonrpc-c/janssonrpc_io.c index a25e40d..7cdb229 100644 --- a/modules/janssonrpc-c/janssonrpc_io.c +++ b/modules/janssonrpc-c/janssonrpc_io.c @@ -430,6 +430,7 @@ int jsonrpc_send(str conn, jsonrpc_request_t* req, bool notify_only) if (sent) { if (notify_only == true) { // free the request if using janssonrpc_notification function + free_req_cmd(req->cmd); free_request(req); } else { const struct timeval tv = ms_to_tv(req->timeout); @@ -534,8 +535,6 @@ void cmd_pipe_cb(int fd, short event, void *arg) WARN("%s could not be sent to connection group: %.*s\n", type, STR(req_cmd->conn)); fail_request(JRPC_ERR_SEND, req, "Failed to send request"); - } else if (req_cmd->notify_only == true) { // free notification requests if they are sent - free_req_cmd(req_cmd); } end:

7 years, 6 months

git:master:c5fa782d: Merge pull request #843 from kamailio/jannsonrpc-c-shm-memleak

by GitHub

Module: kamailio Branch: master Commit: c5fa782d551197319972fddcac8d02c626143520 URL: https://github.com/kamailio/kamailio/commit/c5fa782d551197319972fddcac8d02c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-11-02T15:49:52+01:00 Merge pull request #843 from kamailio/jannsonrpc-c-shm-memleak janssonrpc-c: fix shared memory leak on notification requests --- Modified: modules/janssonrpc-c/janssonrpc_io.c --- Diff: https://github.com/kamailio/kamailio/commit/c5fa782d551197319972fddcac8d02c… Patch: https://github.com/kamailio/kamailio/commit/c5fa782d551197319972fddcac8d02c… --- diff --git a/modules/janssonrpc-c/janssonrpc_io.c b/modules/janssonrpc-c/janssonrpc_io.c index 036032e..a25e40d 100644 --- a/modules/janssonrpc-c/janssonrpc_io.c +++ b/modules/janssonrpc-c/janssonrpc_io.c @@ -534,6 +534,8 @@ void cmd_pipe_cb(int fd, short event, void *arg) WARN("%s could not be sent to connection group: %.*s\n", type, STR(req_cmd->conn)); fail_request(JRPC_ERR_SEND, req, "Failed to send request"); + } else if (req_cmd->notify_only == true) { // free notification requests if they are sent + free_req_cmd(req_cmd); } end:

7 years, 6 months

git:master:cf8d6066: janssonrpc-c: fix shared memory leak on notification requests

by Emmanuel Schmidbauer

Module: kamailio Branch: master Commit: cf8d6066afc102d5904dddec0275079885f0ead1 URL: https://github.com/kamailio/kamailio/commit/cf8d6066afc102d5904dddec0275079… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Date: 2016-11-02T10:15:49-04:00 janssonrpc-c: fix shared memory leak on notification requests --- Modified: modules/janssonrpc-c/janssonrpc_io.c --- Diff: https://github.com/kamailio/kamailio/commit/cf8d6066afc102d5904dddec0275079… Patch: https://github.com/kamailio/kamailio/commit/cf8d6066afc102d5904dddec0275079… --- diff --git a/modules/janssonrpc-c/janssonrpc_io.c b/modules/janssonrpc-c/janssonrpc_io.c index 036032e..a25e40d 100644 --- a/modules/janssonrpc-c/janssonrpc_io.c +++ b/modules/janssonrpc-c/janssonrpc_io.c @@ -534,6 +534,8 @@ void cmd_pipe_cb(int fd, short event, void *arg) WARN("%s could not be sent to connection group: %.*s\n", type, STR(req_cmd->conn)); fail_request(JRPC_ERR_SEND, req, "Failed to send request"); + } else if (req_cmd->notify_only == true) { // free notification requests if they are sent + free_req_cmd(req_cmd); } end:

7 years, 6 months

← Newer
1
...
22
23
24
25
26
27
28
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2016