sr-dev August 2017

sr-dev@lists.kamailio.org

24 participants
306 discussions

git:master:d58fdb7c: p_usrloc: fix dereference before null check in code path
by Lucian Balaceanu 03 Aug '17

03 Aug '17

Module: kamailio Branch: master Commit: d58fdb7c4e2e96a1bb2c64a47cc2b17e4bd03b4e URL: https://github.com/kamailio/kamailio/commit/d58fdb7c4e2e96a1bb2c64a47cc2b17… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2017-08-03T10:28:28+03:00 p_usrloc: fix dereference before null check in code path --- Modified: src/modules/p_usrloc/ul_db_query.c --- Diff: https://github.com/kamailio/kamailio/commit/d58fdb7c4e2e96a1bb2c64a47cc2b17… Patch: https://github.com/kamailio/kamailio/commit/d58fdb7c4e2e96a1bb2c64a47cc2b17… --- diff --git a/src/modules/p_usrloc/ul_db_query.c b/src/modules/p_usrloc/ul_db_query.c index 6185e35d2f..eff45a07e1 100644 --- a/src/modules/p_usrloc/ul_db_query.c +++ b/src/modules/p_usrloc/ul_db_query.c @@ -37,13 +37,15 @@ int db_query(ul_db_handle_t * handle, db1_con_t *** _r_h, db_func_t ** _r_f, int i; int err[DB_NUM]; int ret = -1; - order_dbs(handle, order); - memset(err, 0 , sizeof(int) * DB_NUM); if(!handle || !table || !table->s || !_r_h) { LM_ERR("NULL pointer in parameter.\n"); return -1; } + + order_dbs(handle, order); + memset(err, 0 , sizeof(int) * DB_NUM); + i = 0; do { LM_DBG("now trying id %i, db %i.\n", handle->id, handle->db[order[i]].no);

1 0

git:master:f567695d: p_usrloc: remove unnecessary increment
by Lucian Balaceanu 03 Aug '17

03 Aug '17

Module: kamailio Branch: master Commit: f567695de9ecbb5a5bffe4e212a294df2753a519 URL: https://github.com/kamailio/kamailio/commit/f567695de9ecbb5a5bffe4e212a294d… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2017-08-03T10:28:28+03:00 p_usrloc: remove unnecessary increment --- Modified: src/modules/p_usrloc/ul_db_watch.c --- Diff: https://github.com/kamailio/kamailio/commit/f567695de9ecbb5a5bffe4e212a294d… Patch: https://github.com/kamailio/kamailio/commit/f567695de9ecbb5a5bffe4e212a294d… --- diff --git a/src/modules/p_usrloc/ul_db_watch.c b/src/modules/p_usrloc/ul_db_watch.c index 903abb0b39..d736f942c9 100644 --- a/src/modules/p_usrloc/ul_db_watch.c +++ b/src/modules/p_usrloc/ul_db_watch.c @@ -145,7 +145,6 @@ void check_dbs(unsigned int ticks, void *param){ ul_db_check(handles->handle); } tmp = tmp->next; - i++; } lock_release(list_lock); }

1 0

git:master:a72abf8b: p_usrloc: fix out-of-bounds read
by Lucian Balaceanu 03 Aug '17

03 Aug '17

Module: kamailio Branch: master Commit: a72abf8b1db2ecd8fabfd3e051d1bd61fd205a07 URL: https://github.com/kamailio/kamailio/commit/a72abf8b1db2ecd8fabfd3e051d1bd6… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2017-08-03T10:28:28+03:00 p_usrloc: fix out-of-bounds read --- Modified: src/modules/p_usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/a72abf8b1db2ecd8fabfd3e051d1bd6… Patch: https://github.com/kamailio/kamailio/commit/a72abf8b1db2ecd8fabfd3e051d1bd6… --- diff --git a/src/modules/p_usrloc/udomain.c b/src/modules/p_usrloc/udomain.c index 11f0a131d6..227c0c4696 100644 --- a/src/modules/p_usrloc/udomain.c +++ b/src/modules/p_usrloc/udomain.c @@ -508,7 +508,7 @@ urecord_t* db_load_urecord_by_ruid(udomain_t* _d, str *_ruid) else order = &q_col; - if (ul_db_layer_query(_d, &vals[0].val.str_val, &vals[1].val.str_val, keys, 0, vals, columns, 1, 18, order, + if (ul_db_layer_query(_d, &vals[0].val.str_val, NULL, keys, 0, vals, columns, 1, 18, order, &res) < 0) { LM_ERR("db_query failed\n"); return 0;

1 0

git:master:3c9b1d30: p_usrloc: eliminate unused code
by Lucian Balaceanu 03 Aug '17

03 Aug '17

Module: kamailio Branch: master Commit: 3c9b1d30f5350973bb6063ca207a3f0145f73ec5 URL: https://github.com/kamailio/kamailio/commit/3c9b1d30f5350973bb6063ca207a3f0… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2017-08-03T10:28:28+03:00 p_usrloc: eliminate unused code --- Modified: src/modules/p_usrloc/ul_db_handle.c Modified: src/modules/p_usrloc/ul_db_handle.h --- Diff: https://github.com/kamailio/kamailio/commit/3c9b1d30f5350973bb6063ca207a3f0… Patch: https://github.com/kamailio/kamailio/commit/3c9b1d30f5350973bb6063ca207a3f0… --- diff --git a/src/modules/p_usrloc/ul_db_handle.c b/src/modules/p_usrloc/ul_db_handle.c index cf0dabdfa7..d827450916 100644 --- a/src/modules/p_usrloc/ul_db_handle.c +++ b/src/modules/p_usrloc/ul_db_handle.c @@ -301,80 +301,6 @@ int load_location_number(db_func_t * dbf, db1_con_t* dbh, int *loc_nr){ return 0; } -int load_handles(db_func_t * dbf, db1_con_t * dbh) { - static char query[UL_DB_QUERY_LEN]; - db1_res_t * res; - db_row_t * row; - ul_db_handle_list_t * element; - int i, id, query_len; - str tmp; - - if(!dbf || !dbh){ - LM_ERR("NULL parameter passed \n"); - return -1; - } - - query_len = 25 + id_col.len + reg_table.len; - - if(query_len > UL_DB_QUERY_LEN) { - LM_ERR("weird: query larger than %i bytes.\n", UL_DB_QUERY_LEN); - return -1; - } - - memset(query, 0, UL_DB_QUERY_LEN); - - if (sprintf(query, - "SELECT DISTINCT " - "%.*s " - "FROM " - "%.*s", - id_col.len, id_col.s, - reg_table.len, reg_table.s) < 0) { - LM_ERR("could not print query\n"); - return -1; - } - tmp.s = query; - tmp.len = strlen(query); - - if (dbf->raw_query (dbh, &tmp, &res) < 0) { - LM_ERR("in database query.\n"); - return -1; - } - - if (RES_ROW_N (res) == 0) { - dbf->free_result (dbh, res); - LM_DBG ("no data found\n"); - return 1; - } - - for (i = 0; i < RES_ROW_N (res); ++i) { - row = RES_ROWS (res) + i; - - if((element = allocate_handle_list()) == NULL) { - LM_ERR("couldnt allocate handle.\n"); - goto errout; - } - - if (VAL_NULL (ROW_VALUES(row) + 0)) { - LM_ERR("Weird: Empty ID-Field\n"); - goto errout; - } - - id = VAL_INT (ROW_VALUES(row) + 0); - if(load_data(dbf, dbh, element->handle, id) < 0){ - LM_ERR("couldn't load handle data.\n"); - goto errout; - } - element->next = db_handles; - db_handles = element; - } - dbf->free_result (dbh, res); - return 0; -errout: - dbf->free_result (dbh, res); - return -1; -} - int refresh_handles(db_func_t * dbf, db1_con_t * dbh) { ul_db_handle_list_t * element; int i; diff --git a/src/modules/p_usrloc/ul_db_handle.h b/src/modules/p_usrloc/ul_db_handle.h index b9b5ade276..9916dc56ac 100644 --- a/src/modules/p_usrloc/ul_db_handle.h +++ b/src/modules/p_usrloc/ul_db_handle.h @@ -71,7 +71,6 @@ void destroy_handles(void); int refresh_handles(db_func_t * dbf, db1_con_t * dbh); int load_location_number(db_func_t * dbf, db1_con_t * dbh, int*); -int load_handles(db_func_t * dbf, db1_con_t * dbh); ul_db_handle_t * get_handle(db_func_t * dbf, db1_con_t * dbh, str * first, str * second);

1 0

git:master:2a67f799: p_usrloc: fix resource leak
by Lucian Balaceanu 03 Aug '17

03 Aug '17

Module: kamailio Branch: master Commit: 2a67f79945475cfbe8d033b4df39018a73346db1 URL: https://github.com/kamailio/kamailio/commit/2a67f79945475cfbe8d033b4df39018… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2017-08-03T10:28:28+03:00 p_usrloc: fix resource leak --- Modified: src/modules/p_usrloc/ul_db_layer.c --- Diff: https://github.com/kamailio/kamailio/commit/2a67f79945475cfbe8d033b4df39018… Patch: https://github.com/kamailio/kamailio/commit/2a67f79945475cfbe8d033b4df39018… --- diff --git a/src/modules/p_usrloc/ul_db_layer.c b/src/modules/p_usrloc/ul_db_layer.c index 36f02d5437..036adf23bb 100644 --- a/src/modules/p_usrloc/ul_db_layer.c +++ b/src/modules/p_usrloc/ul_db_layer.c @@ -218,27 +218,26 @@ int ul_add_domain_db(str * d, int t, str * url) { return -1; } memset(new_d, 0, sizeof(ul_domain_db_list_t)); - if(!d){ - return -1; - } - if(!d->s){ - return -1; - } + + if(!d || !d->s) goto error; + if((new_d->domain.name.s = pkg_malloc(d->len + 1)) == NULL) { - return -1; + goto error; } + if(t == DB_TYPE_SINGLE) { if(url) { LM_DBG("url: %.*s", url->len, url->s); if((new_d->domain.url.s = pkg_malloc(url->len + 1)) == NULL) { - return -1; + goto error; } + strncpy(new_d->domain.url.s, url->s, url->len); new_d->domain.url.s[url->len] = '\0'; new_d->domain.url.len = url->len; } else { if((new_d->domain.url.s = pkg_malloc(default_db_url.len + 1)) == NULL) { - return -1; + goto error; } strcpy(new_d->domain.url.s, default_db_url.s); new_d->domain.url.len = default_db_url.len; @@ -250,6 +249,9 @@ int ul_add_domain_db(str * d, int t, str * url) { new_d->next = domain_db_list; domain_db_list = new_d; return 1; +error: + pkg_free(new_d); + return -1; } ul_domain_db_t * ul_find_domain(const char * s) {

1 0

git:master:92f66e05: dispatcher: define values for dispatching algorithms
by Daniel-Constantin Mierla 03 Aug '17

03 Aug '17

Module: kamailio Branch: master Commit: 92f66e05b3b93c67acdaadfd2374cb91d01413f1 URL: https://github.com/kamailio/kamailio/commit/92f66e05b3b93c67acdaadfd2374cb9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-03T07:29:57+02:00 dispatcher: define values for dispatching algorithms --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/92f66e05b3b93c67acdaadfd2374cb9… Patch: https://github.com/kamailio/kamailio/commit/92f66e05b3b93c67acdaadfd2374cb9…

1 0

git:master:b5bccd0f: db_text: missing breaks in checking db types compatibility
by Daniel-Constantin Mierla 03 Aug '17

03 Aug '17

Module: kamailio Branch: master Commit: b5bccd0f4e14909b4a0ba2ab3957b2ea9b28ed0c URL: https://github.com/kamailio/kamailio/commit/b5bccd0f4e14909b4a0ba2ab3957b2e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-03T05:03:24+02:00 db_text: missing breaks in checking db types compatibility --- Modified: src/modules/db_text/dbt_lib.c --- Diff: https://github.com/kamailio/kamailio/commit/b5bccd0f4e14909b4a0ba2ab3957b2e… Patch: https://github.com/kamailio/kamailio/commit/b5bccd0f4e14909b4a0ba2ab3957b2e… --- diff --git a/src/modules/db_text/dbt_lib.c b/src/modules/db_text/dbt_lib.c index 3a1ec79eb8..0735c04c2e 100644 --- a/src/modules/db_text/dbt_lib.c +++ b/src/modules/db_text/dbt_lib.c @@ -442,30 +442,34 @@ int dbt_is_neq_type(db_type_t _t0, db_type_t _t1) case DB1_INT: if(_t0==DB1_DATETIME || _t0==DB1_BITMAP) return 0; - + break; case DB1_BIGINT: LM_ERR("BIGINT not supported\n"); return 0; - case DB1_DATETIME: if(_t0==DB1_INT) return 0; if(_t0==DB1_BITMAP) return 0; + break; case DB1_DOUBLE: break; case DB1_STRING: if(_t0==DB1_STR || _t0==DB1_BLOB) return 0; + break; case DB1_STR: if(_t0==DB1_STRING || _t0==DB1_BLOB) return 0; + break; case DB1_BLOB: if(_t0==DB1_STR || _t0==DB1_STRING) return 0; + break; case DB1_BITMAP: if (_t0==DB1_INT) return 0; + break; default: LM_ERR("invalid datatype %d\n", _t1); return 1; @@ -483,7 +487,6 @@ dbt_table_p dbt_db_get_temp_table(dbt_cache_p _dc) int hash; int hashidx; - if(!_dbt_cachetbl || !_dc) { LM_ERR("invalid parameter\n"); return NULL; @@ -500,8 +503,6 @@ dbt_table_p dbt_db_get_temp_table(dbt_cache_p _dc) _tbc = _dbt_cachetbl[hashidx].dtp; - - _tbc = dbt_table_new(&_s, &(_dc->name), NULL); _tbc->hash = hash; @@ -513,7 +514,6 @@ dbt_table_p dbt_db_get_temp_table(dbt_cache_p _dc) dbt_table_update_flags(_tbc, DBT_TBFL_TEMP, DBT_FL_SET, 0); - lock_release(&_dbt_cachetbl[hashidx].sem); return _tbc; }

1 0

git:master:b05f3637: cplc: safety checks for parameters
by Daniel-Constantin Mierla 03 Aug '17

03 Aug '17

Module: kamailio Branch: master Commit: b05f3637f9cc829470d04037f6f5b88e37819706 URL: https://github.com/kamailio/kamailio/commit/b05f3637f9cc829470d04037f6f5b88… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-08-03T05:02:41+02:00 cplc: safety checks for parameters --- Modified: src/modules/cplc/cpl_nonsig.c Modified: src/modules/cplc/cpl_switches.h --- Diff: https://github.com/kamailio/kamailio/commit/b05f3637f9cc829470d04037f6f5b88… Patch: https://github.com/kamailio/kamailio/commit/b05f3637f9cc829470d04037f6f5b88… --- diff --git a/src/modules/cplc/cpl_nonsig.c b/src/modules/cplc/cpl_nonsig.c index d87c02d18f..ba53ee0ab6 100644 --- a/src/modules/cplc/cpl_nonsig.c +++ b/src/modules/cplc/cpl_nonsig.c @@ -230,11 +230,18 @@ void cpl_aux_process( int cmd_out, char *log_dir) LM_ERR("cannot set to IGNORE SIGCHLD signal\n"); } + file[0] = '\0'; + file_ptr = file; /* set the path for logging */ if (log_dir) { - strcpy( file, log_dir); - file_ptr = file + strlen(log_dir); - *(file_ptr++) = '/'; + if(strlen(log_dir)>=MAX_LOG_DIR_SIZE) { + /* fallback */ + LM_ERR("log dir path is too long, ignoring - check workdir\n"); + } else { + strcpy(file, log_dir); + file_ptr = file + strlen(log_dir); + *(file_ptr++) = '/'; + } } while(1) { diff --git a/src/modules/cplc/cpl_switches.h b/src/modules/cplc/cpl_switches.h index 4a99b2cbe4..2accfd21b9 100644 --- a/src/modules/cplc/cpl_switches.h +++ b/src/modules/cplc/cpl_switches.h @@ -873,6 +873,12 @@ inline static int is_lang_tag_matching(str *range,str *cpl_tag,str *cpl_subtag) str tag = {0,0}; str subtag = {0,0}; + if(range==NULL || cpl_tag==NULL || cpl_subtag==NULL) { + return -1; + } + if(range->s==NULL || cpl_tag->s==NULL || cpl_subtag->s==NULL) { + return -1; + } c = range->s; end = range->s + range->len;

1 0

[kamailio/kamailio] Unable to capture the SIP DATA (#1202)
by bharathg65 02 Aug '17

02 Aug '17

Dear Team, Any one pls help me , i have been struck with this more than 2 months , i have keep on changing the kamailio.cfg but nothing has worked . Initially i had plan to user captagent but unfortunately i couldn't run in CentOS since its failing in init procedure , because document which is provided in github is only for other OS . so planned to use kamailio as capture server . When ever i tried to run sipgrep , its showing data running on my server . And when i used command kamailio -c , i can see below interface is listening , but its not capturing any data and sending to mysql . root@localhost kamailio]# kamailio -c 0(6624) WARNING: <core> [ppcfg.c:221]: pp_ifdef_level_check(): different number of preprocessor directives: N(#!IF[N]DEF) - N(#!ENDIF) = 1 Listening on udp: 172.16.5.158:9060 Aliases: udp: localhost.localdom:9060 udp: localhost.localdomain:9060 And My sql is running fine without any issue . Any one can pls audit my configuration and advise me . because am New to Centos and homer . Thanks in advance -- 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/issues/1202

2 5

[kamailio/kamailio] Incorret code example in pipelimit documentation (#1201)
by Evgeniy 02 Aug '17

02 Aug '17

### Description In the documentation documentation for module pipelimit https://www.kamailio.org/docs/modules/4.2.x/modules/ratelimit.html has an error in example: ```# perform pipe match for authenticated user $var(limit) = 20; if (!pl_check("$au", "traildrop", "$var(limit)")) { pl_drop(); exit; } ``` If write algorithm "traildrop" in function pl_check, you every execution will get return code -2 and pipe not will be created. ### Possible Solutions Change string "traildrop" on "TAILDROP" ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio 4.2.3 ``` -- 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/issues/1201

2 2

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2017