sr-dev November 2021

sr-dev@lists.kamailio.org

20 participants
309 discussions

[kamailio/kamailio] runtime error: null pointer passed as argument 2, which is declared to never be null (Issue #2913)

by sergey-safarov

### Description I have compiled Kamailio with google ASAN module and faced issue where the string PV with NULL value cannot be copied. Using GDB I found this function call triggers error when Google ASAN is used, `value->s.s = NULL`, `value->s.len = 0` ``` memcpy(var->v.value.s.s, value->s.s, value->s.len); ``` [Link](https://github.com/kamailio/kamailio/blob/caccb13e29ee12166c8101efa0d… This happens only when ASAN is used. Without ASAN same function call with the same values does not trigger an error. In my test case this function called from [`lost/functions.c:1285`](https://github.com/kamailio/kamailio/blob/caccb13e29ee12166c8101efa0d5ab2745876413/src/modules/lost/functions.c#L1285) To compile with asan used extra flags ``` -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=null -fno-sanitize=alignment ``` ### Troubleshooting #### Log Messages ``` 0(913407) INFO: {1 1 INVITE 1-455779(a)172.21.0.84} lost [functions.c:891]: lost_function(): ### LOST urn [urn:sip:911@3.236.25.254:5060] 0(913407) INFO: {1 1 INVITE 1-455779(a)172.21.0.84} lost [functions.c:983]: lost_function(): ### LOST loc [<112233445566(a)jim.com>] 0(913407) ERROR: {1 1 INVITE 1-455779(a)172.21.0.84} lost [utilities.c:336]: lost_get_content(): could not get XML node content pv_svar.c:137:3: runtime error: null pointer passed as argument 2, which is declared to never be null ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` current master, test 375f86b69e11cf835ae919873d3cd56f32d589c8 * **Operating System**: Centos 8 -- 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/2913

2 years, 5 months

git:master:6857234c: core: reorder fields of struct _cfg_group for better alignment

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6857234c321faf33573e1a034ab666dc158eb549 URL: https://github.com/kamailio/kamailio/commit/6857234c321faf33573e1a034ab666d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-04T17:15:49+01:00 core: reorder fields of struct _cfg_group for better alignment --- Modified: src/core/cfg/cfg_struct.h --- Diff: https://github.com/kamailio/kamailio/commit/6857234c321faf33573e1a034ab666d… Patch: https://github.com/kamailio/kamailio/commit/6857234c321faf33573e1a034ab666d… --- diff --git a/src/core/cfg/cfg_struct.h b/src/core/cfg/cfg_struct.h index e03024e700..03f38f322d 100644 --- a/src/core/cfg/cfg_struct.h +++ b/src/core/cfg/cfg_struct.h @@ -76,7 +76,6 @@ enum { CFG_GROUP_UNKNOWN = 0, CFG_GROUP_DYNAMIC, CFG_GROUP_STATIC }; /*! \brief linked list of registered groups */ #pragma pack(push, 1) typedef struct _cfg_group { - int num; /*!< number of variables within the group */ cfg_mapping_t *mapping; /*!< describes the mapping betweeen the cfg variable definition and the memory block */ char *vars; /*!< pointer to the memory block where the values @@ -85,6 +84,7 @@ typedef struct _cfg_group { cfg_add_var_t *add_var; /*!< Additional instances of the variables. This linked list is used only before the config is shmized. */ + int num; /*!< number of variables within the group */ int size; /*!< size of the memory block that has to be allocated to store the values */ int meta_offset; /*!< offset of the group within the @@ -100,9 +100,9 @@ typedef struct _cfg_group { to temporary set the handle in the main process and restore it later to its original value. */ - unsigned char dynamic; /*!< indicates whether the variables within the group - are dynamically allocated or not */ struct _cfg_group *next; + unsigned int dynamic; /*!< indicates whether the variables within the group + are dynamically allocated or not */ int name_len; char name[1]; } cfg_group_t;

2 years, 5 months

[kamailio/kamailio] mqueue: add two new module parameters (#2825)

by Stefan Mititelu

Add mqueue_name and mqueue_size to define queues. Updated doc.   #### Pre-Submission Checklist    - [X] Commit message has the format required by CONTRIBUTING guide - [X] Commits are split per component (core, individual modules, libs, utils, ...) - [X] Each component has a single commit (if not, squash them into one commit) - [X] 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) - [X] 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 - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Add 2 new mqueue module parameters to simplify config queue definition. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2825 -- Commit Summary -- * mqueue: add two new module parameters -- File Changes -- M src/modules/mqueue/doc/mqueue_admin.xml (58) M src/modules/mqueue/mqueue_mod.c (38) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2825.patch https://github.com/kamailio/kamailio/pull/2825.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/2825

2 years, 5 months

Re: [sr-dev] [kamailio/kamailio] nats: Add publish function (e736af9)

by Olle E. Johansson

Nice! Missing docs update. :-) Thank you - will try this out. -- 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/commit/e736af98038663cbbb2abf0a3c16c42…

2 years, 5 months

git:master:2c68066d: pkg/kamailio/deb: version set 5.6.0~dev2

by Victor Seva

Module: kamailio Branch: master Commit: 2c68066dc8aa5f75de79cad1f4bea973db18bed7 URL: https://github.com/kamailio/kamailio/commit/2c68066dc8aa5f75de79cad1f4bea97… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-04T11:31:41+01:00 pkg/kamailio/deb: version set 5.6.0~dev2 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/2c68066dc8aa5f75de79cad1f4bea97… Patch: https://github.com/kamailio/kamailio/commit/2c68066dc8aa5f75de79cad1f4bea97…

2 years, 5 months

git:master:a48e1a9b: pua_dialoginfo: fix memory corruption

by Victor Seva

Module: kamailio Branch: master Commit: a48e1a9baf16752c49f7de68700659b947e9f3d8 URL: https://github.com/kamailio/kamailio/commit/a48e1a9baf16752c49f7de68700659b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-11-04T11:07:49+01:00 pua_dialoginfo: fix memory corruption * don't use SRUID_SIZE, just reserve the proper generated size * call sruid_init() at child_init too --- Modified: src/modules/pua_dialoginfo/dialog_publish.c Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/a48e1a9baf16752c49f7de68700659b… Patch: https://github.com/kamailio/kamailio/commit/a48e1a9baf16752c49f7de68700659b… --- diff --git a/src/modules/pua_dialoginfo/dialog_publish.c b/src/modules/pua_dialoginfo/dialog_publish.c index 7f2751ffca..137823c21b 100644 --- a/src/modules/pua_dialoginfo/dialog_publish.c +++ b/src/modules/pua_dialoginfo/dialog_publish.c @@ -363,7 +363,7 @@ void dialog_publish(char *state, str* ruri, str *entity, str *peer, str *callid, } publ->id.s= (char*)publ+ size; memcpy(publ->id.s, "DIALOG_PUBLISH.", 15); - memcpy(publ->id.s+15, uuid->s, callid->len); + memcpy(publ->id.s+15, uuid->s, uuid->len); publ->id.len= 15+ uuid->len; size+= publ->id.len; diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c index 9af25b4b1d..0385ed90dd 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -108,7 +108,7 @@ send_publish_t pua_send_publish; /** module functions */ static int mod_init(void); - +static int child_init(int rank); static cmd_export_t cmds[]={ {0, 0, 0, 0, 0, 0} @@ -146,7 +146,7 @@ struct module_exports exports= { 0, /* exported pseudo-variables */ 0, /* response handling function */ mod_init, /* module initialization function */ - 0, /* per-child init function */ + child_init, /* per-child init function */ 0 /* module destroy function */ }; @@ -490,6 +490,13 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type, int disable int len; str* s=NULL; + // generate new random uuid + if(sruid_next_safe(&_puadi_sruid) < 0) { + return NULL; + } + LM_DBG("uuid generated: '%.*s'\n", + _puadi_sruid.uid.len, _puadi_sruid.uid.s); + /* create dlginfo structure to store important data inside the module*/ len = sizeof(struct dlginfo_cell) + dlg->from_uri.len @@ -498,7 +505,7 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type, int disable + dlg->tag[0].len + dlg->req_uri.len + dlg->contact[0].len - + SRUID_SIZE; + + _puadi_sruid.uid.len; dlginfo = (struct dlginfo_cell*)shm_malloc( len ); if (dlginfo==0) { @@ -524,7 +531,7 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type, int disable dlginfo->from_contact.s = dlginfo->req_uri.s + dlginfo->req_uri.len; dlginfo->from_contact.len = dlg->contact[0].len; dlginfo->uuid.s = dlginfo->from_contact.s + dlginfo->from_contact.len; - dlginfo->uuid.len = SRUID_SIZE; + dlginfo->uuid.len = _puadi_sruid.uid.len; memcpy(dlginfo->from_uri.s, dlg->from_uri.s, dlg->from_uri.len); memcpy(dlginfo->to_uri.s, dlg->to_uri.s, dlg->to_uri.len); @@ -532,13 +539,7 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type, int disable memcpy(dlginfo->from_tag.s, dlg->tag[0].s, dlg->tag[0].len); memcpy(dlginfo->req_uri.s, dlg->req_uri.s, dlg->req_uri.len); memcpy(dlginfo->from_contact.s, dlg->contact[0].s, dlg->contact[0].len); - - // generate new random uuid - sruid_next_safe(&_puadi_sruid); - strcpy(dlginfo->uuid.s, _puadi_sruid.uid.s); - dlginfo->uuid.len = _puadi_sruid.uid.len; - LM_DBG("uuid generated: '%.*s'\n", - dlginfo->uuid.len, dlginfo->uuid.s); + memcpy(dlginfo->uuid.s, _puadi_sruid.uid.s, _puadi_sruid.uid.len); if (use_pubruri_avps) { if(type==DLGCB_CREATED) { @@ -858,6 +859,22 @@ static int mod_init(void) return 0; } +/** + * @brief Initialize module children + */ +static int child_init(int rank) +{ + if(sruid_init(&_puadi_sruid, (char)'-', "padi", SRUID_INC)<0) { + return -1; + } + + if(rank != PROC_MAIN) { + return 0; + } + + return 0; +} + void free_dlginfo_cell(void *param) { struct dlginfo_cell *cell = NULL;

2 years, 5 months

git:master:6eb67eaa: pv: handle case when var value ha flag str but null pointer

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6eb67eaa4fc27d1eb7da7b2b674ffe8e7f86ecbc URL: https://github.com/kamailio/kamailio/commit/6eb67eaa4fc27d1eb7da7b2b674ffe8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-04T08:24:06+01:00 pv: handle case when var value ha flag str but null pointer --- Modified: src/modules/pv/pv_svar.c --- Diff: https://github.com/kamailio/kamailio/commit/6eb67eaa4fc27d1eb7da7b2b674ffe8… Patch: https://github.com/kamailio/kamailio/commit/6eb67eaa4fc27d1eb7da7b2b674ffe8… --- diff --git a/src/modules/pv/pv_svar.c b/src/modules/pv/pv_svar.c index 255f9f2040..456e21963a 100644 --- a/src/modules/pv/pv_svar.c +++ b/src/modules/pv/pv_svar.c @@ -90,7 +90,7 @@ script_var_t* set_var_value(script_var_t* var, int_str *value, int flags) { if(var==0) return 0; - if(value==NULL) + if((value==NULL) || ((flags&VAR_VAL_STR) && (var->v.value.s.s==NULL))) { if(var->v.flags&VAR_VAL_STR) {

2 years, 5 months

git:master:fc3010cc: Makefile.defs: version set to 5.6.0-dev2

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: fc3010cc2643d5398db12d92707d849cdc1d7d78 URL: https://github.com/kamailio/kamailio/commit/fc3010cc2643d5398db12d92707d849… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-04T08:06:31+01:00 Makefile.defs: version set to 5.6.0-dev2 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/fc3010cc2643d5398db12d92707d849… Patch: https://github.com/kamailio/kamailio/commit/fc3010cc2643d5398db12d92707d849… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 51a14f5ab4..5d76fbe2cc 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 6 SUBLEVEL = 0 -EXTRAVERSION = -dev1 +EXTRAVERSION = -dev2 # memory manager switcher # 0 - f_malloc (fast malloc)

2 years, 5 months

git:master:b1e0d418: Merge pull request #2891 from smititelu/increase_defines

by GitHub

Module: kamailio Branch: master Commit: b1e0d41875f224da5bd5c511cbafd0f5e395d0b6 URL: https://github.com/kamailio/kamailio/commit/b1e0d41875f224da5bd5c511cbafd0f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-11-03T12:59:34+01:00 Merge pull request #2891 from smititelu/increase_defines acc: increase extra and cdr variables --- Modified: src/modules/acc/acc.c Modified: src/modules/acc/acc.h Modified: src/modules/acc/acc_cdr.c Modified: src/modules/acc/acc_cdr.h Modified: src/modules/acc/acc_extra.c Modified: src/modules/acc/acc_extra.h Modified: src/modules/acc/acc_mod.c Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b1e0d41875f224da5bd5c511cbafd0f… Patch: https://github.com/kamailio/kamailio/commit/b1e0d41875f224da5bd5c511cbafd0f…

2 years, 5 months

git:master:38ae4433: drouting: remove unused trim function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 38ae44336e8478c10e1a558997669850c5d7b297 URL: https://github.com/kamailio/kamailio/commit/38ae44336e8478c10e1a55899766985… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-03T13:27:20+01:00 drouting: remove unused trim function --- Modified: src/modules/drouting/dr_time.c --- Diff: https://github.com/kamailio/kamailio/commit/38ae44336e8478c10e1a55899766985… Patch: https://github.com/kamailio/kamailio/commit/38ae44336e8478c10e1a55899766985… --- diff --git a/src/modules/drouting/dr_time.c b/src/modules/drouting/dr_time.c index 0988bccbb7..55d09a57ca 100644 --- a/src/modules/drouting/dr_time.c +++ b/src/modules/drouting/dr_time.c @@ -45,34 +45,6 @@ static inline int strz2int(char *_bp) } -static inline char *trim(char *_s) -{ - int len; - char *end; - - /* Null pointer, there is nothing to do */ - if(!_s) - return _s; - - /* Remove spaces and tabs from the beginning of string */ - while((*_s == ' ') || (*_s == '\t')) - _s++; - - len = strlen(_s); - - end = _s + len - 1; - - /* Remove trailing spaces and tabs */ - while((*end == ' ') || (*end == '\t')) - end--; - if(end != (_s + len - 1)) { - *(end + 1) = '\0'; - } - - return _s; -} - - /************************ imported from "ac_tm.c" ***************************/ /* #define USE_YWEEK_U // Sunday system

2 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2021