sr-dev September 2015

sr-dev@lists.kamailio.org

37 participants
387 discussions

git:4.2:908c2699: Makefile.defs: memory manager set to q_malloc
by Daniel-Constantin Mierla 23 Sep '15

23 Sep '15

Module: kamailio Branch: 4.2 Commit: 908c2699e1ec2cfd72c62beab1e213b3f4465bb3 URL: https://github.com/kamailio/kamailio/commit/908c2699e1ec2cfd72c62beab1e213b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-23T11:52:47+02:00 Makefile.defs: memory manager set to q_malloc (cherry picked from commit 8bdb3f95d3db79bea5f3d49e2c8b0fc090bb65dd) --- Modified: Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/908c2699e1ec2cfd72c62beab1e213b… Patch: https://github.com/kamailio/kamailio/commit/908c2699e1ec2cfd72c62beab1e213b… --- diff --git a/Makefile.defs b/Makefile.defs index 378c73f..d760c22 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -170,7 +170,7 @@ EXTRAVERSION = # memory manager switcher # 0 - f_malloc (fast malloc) # 1 - q_malloc (quick malloc) -MEMMNG ?= 0 +MEMMNG ?= 1 # memory debugger switcher # 0 - off (no-debug mode) # 1 - on (debug mode)

1 0

git:master:f6270fcc: Merge pull request #334 from zxcpoiu/master
by Daniel-Constantin Mierla 23 Sep '15

23 Sep '15

Module: kamailio Branch: master Commit: f6270fcc1911cc76a5182461b18e5ba11cddd20c URL: https://github.com/kamailio/kamailio/commit/f6270fcc1911cc76a5182461b18e5ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-23T11:29:21+02:00 Merge pull request #334 from zxcpoiu/master tmx: safety check for bad callid header in t_precheck_tran() --- Modified: modules/tmx/tmx_pretran.c --- Diff: https://github.com/kamailio/kamailio/commit/f6270fcc1911cc76a5182461b18e5ba… Patch: https://github.com/kamailio/kamailio/commit/f6270fcc1911cc76a5182461b18e5ba… --- diff --git a/modules/tmx/tmx_pretran.c b/modules/tmx/tmx_pretran.c index 8ba74df..00f571b 100644 --- a/modules/tmx/tmx_pretran.c +++ b/modules/tmx/tmx_pretran.c @@ -227,6 +227,10 @@ int tmx_check_pretran(sip_msg_t *msg) LM_ERR("failed to get From header\n"); return -1; } + if (msg->callid==NULL || msg->callid->body.s==NULL) { + LM_ERR("failed to parse callid headers\n"); + return -1; + } vbr = msg->via1->branch;

1 0

git:master:7cc1d111: tmx: safety check for bad callid header in t_precheck_tran()
by zxcpoiu 23 Sep '15

23 Sep '15

Module: kamailio Branch: master Commit: 7cc1d1113e8e461656d55595f1a268d345d2676b URL: https://github.com/kamailio/kamailio/commit/7cc1d1113e8e461656d55595f1a268d… Author: zxcpoiu <zxcpoiu(a)gmail.com> Committer: zxcpoiu <zxcpoiu(a)gmail.com> Date: 2015-09-23T17:23:40+08:00 tmx: safety check for bad callid header in t_precheck_tran() - reported by GH#331 --- Modified: modules/tmx/tmx_pretran.c --- Diff: https://github.com/kamailio/kamailio/commit/7cc1d1113e8e461656d55595f1a268d… Patch: https://github.com/kamailio/kamailio/commit/7cc1d1113e8e461656d55595f1a268d… --- diff --git a/modules/tmx/tmx_pretran.c b/modules/tmx/tmx_pretran.c index 8ba74df..00f571b 100644 --- a/modules/tmx/tmx_pretran.c +++ b/modules/tmx/tmx_pretran.c @@ -227,6 +227,10 @@ int tmx_check_pretran(sip_msg_t *msg) LM_ERR("failed to get From header\n"); return -1; } + if (msg->callid==NULL || msg->callid->body.s==NULL) { + LM_ERR("failed to parse callid headers\n"); + return -1; + } vbr = msg->via1->branch;

1 0

[kamailio] tmx: safety check for bad callid header in t_precheck_tran() (#334)
by zxcpoiu 23 Sep '15

23 Sep '15

- reported by GH#331 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/334 -- Commit Summary -- * tmx: safety check for bad callid header in t_precheck_tran() -- File Changes -- M modules/tmx/tmx_pretran.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/334.patch https://github.com/kamailio/kamailio/pull/334.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/334

2 2

[kamailio] kamailio segfault when doing t_precheck_trans() from tmx.so if Cseq header missed or invalid (#331)
by zxcpoiu 23 Sep '15

23 Sep '15

#### kamailio segfault when doing t_precheck_trans() from tmx.so if Cseq header missed or invalid We received an invalid REGISTER request. Normally, CSeq header is expected to be `Cseq: 2 REGISTER`, but client sent it as `a9: 2 REGISTER` I don't know is this an attack or a buggy/experimental client. But it can be reproduced/attacked easily. Segfault occurs when doing `t_precheck_trans()` from `tmx.so` #### test kamailio version: ``` kamailio 4.3.2 stable kamailio 4.4.0-dev4 (id: 33f159 ) ``` #### backtrace: ``` #0 0x00007fb4a2086496 in tmx_check_pretran (msg=0x7fb5e5920e40) at tmx_pretran.c:214 chid = 0 slotid = 5568065 dsize = 0 vbr = 0x55fbd3d6 scallid = {s = 0x3 <Address 0x3 out of bounds>, len = 5252091} scseqmet = {s = 0xffffffffffffffa8 <Address 0xffffffffffffffa8 out of bounds>, len = 42465376} scseqnum = {s = 0x7fb5e4e3f1c0 "\023", len = -443412928} sftag = {s = 0x3000000010 <Address 0x3000000010 out of bounds>, len = 358984288} svbranch = {s = 0x0, len = 0} it = 0x287f860 __FUNCTION__ = "tmx_check_pretran" #1 0x00007fb4a2084819 in w_t_precheck_trans (msg=0x7fb5e5920e40, p1=0x0, p2=0x0) at tmx_mod.c:713 ret = 4 #2 0x00000000004213a8 in do_action (h=0x7fff1565b230, a=0x7fb5e4e5bea0, msg=0x7fb5e5920e40) at action.c:1053 ret = -5 v = 358985792 dst = {send_sock = 0x0, to = {s = {sa_family = 3, sa_data = "\000\000\000\000\000\000\260\222A\000\000\000\000"}, sin = {sin_family = 3, sin_port = 0, sin_addr = {s_addr = 0}, sin_zero = "\260\222A\000\000\000\000"}, sin6 = {sin6_family = 3, sin6_port = 0, sin6_flowinfo = 0, sin6_addr = {__in6_u = { __u6_addr8 = "\260\222A\000\000\000\000\000\200\312e\025\377\177\000", __u6_addr16 = {37552, 65, 0, 0, 51840, 5477, 32767, 0}, __u6_addr32 = {4297392, 0, 358992512, 32767}}}, sin6_scope_id = 0}}, id = 0, proto = 0 '\000', send_flags = {f = 0 '\000', blst_imask = 0 '\000'}} tmp = 0x7fb4a0d24998 "new_dlg_var" new_uri = 0xaae450 "" end = 0x7fff1565b0bc "\001" crt = 0x740062c98c <Address 0x740062c98c out of bounds> cmd = 0x7fb5e4e00280 len = 0 user = 5244875 uri = {user = {s = 0x36303333 <Address 0x36303333 out of bounds>, len = 5}, passwd = {s = 0x1ffffffff <Address 0x1ffffffff out of bounds>, len = -454825368}, host = {s = 0x7fb5e522a190 "", len = -443412928}, port = {s = 0x400000000 <Address 0x400000000 out of bounds>, len = 0}, params = {s = 0x7fff1565ae50 "\260\222A", len = -443412928}, sip_params = { s = 0x7fb5e4e5b8e0 "\214\002", len = 358989184}, headers = {s = 0x7fb5e4e241f0 "2\002", len = 3}, port_no = 37552, proto = 65, type = ERROR_URI_T, flags = 0, transport = { s = 0x100000000 <Address 0x100000000 out of bounds>, len = 0}, ttl = {s = 0x7fff1565ae70 "", len = 3}, user_param = {s = 0x4192b0 "1\355I\211\321^H\211\342H\203\344\360PTI\307\300\200}p", len = 358992512}, maddr = {s = 0x0, len = 0}, method = {s = 0x7fff1565b500 "\340\265e\025\377\177", len = 4330346}, lr = {s = 0x7fff1565af90 "\240\260e\025\377\177", len = 4382429}, r2 = { s = 0x0, len = -443412928}, gr = {s = 0x7fb5e4e241f0 "2\002", len = 358989184}, transport_val = {s = 0x0, len = -1}, ttl_val = {s = 0x3 <Address 0x3 out of bounds>, len = 1533694924}, user_param_val = {s = 0x4192b0 "1\355I\211\321^H\211\342H\203\344\360PTI\307\300\200}p", len = 358992512}, maddr_val = {s = 0x0, len = 0}, method_val = { s = 0xc33187ed5d0a53cc <Address 0xc33187ed5d0a53cc out of bounds>, len = -1407167540}, lr_val = {s = 0x0, len = 42180172}, r2_val = {s = 0x2839e4c "8", len = 42180172}, gr_val = { s = 0x2839e4d "", len = 0}} next_hop = {user = {s = 0x4192b0 "1\355I\211\321^H\211\342H\203\344\360PTI\307\300\200}p", len = 358992512}, passwd = {s = 0x0, len = 0}, host = {s = 0x7fff1565ac80 "\220\255e\025\377\177", len = -1594701152}, port = {s = 0x41565ad48 <Address 0x41565ad48 out of bounds>, len = -1594672553}, params = {s = 0x1200000000 <Address 0x1200000000 out of bounds>, len = 358986560}, sip_params = {s = 0x7fff1565ad90 "p\256e\025\377\177", len = 3}, headers = {s = 0x3 <Address 0x3 out of bounds>, len = 4297392}, port_no = 51840, proto = 5477, type = 32767, flags = 0, transport = {s = 0x7fff1565ae70 "", len = 5586132}, ttl = {s = 0x7fb5e4e31da8 "\002", len = 0}, user_param = {s = 0x5a0f33e3f <Address 0x5a0f33e3f out of bounds>, len = 42364218}, maddr = { s = 0x0, len = 7893184}, method = {s = 0x30 <Address 0x30 out of bounds>, len = -455233520}, lr = {s = 0x7fb5e523d618 " +\206\002", len = -462842668}, r2 = {s = 0x7fb5e4ddb010 "\001", len = -450635544}, gr = {s = 0x7fb5e4e4c200 "\031", len = 1}, transport_val = {s = 0x7fb5e4e3ea68 "\330\240\"\345\265\177", len = -443412928}, ttl_val = { s = 0x7fb5e52217a0 "authuuid=<urn:uuid:9w12e22c6a-71123a-42423839-9adb-452aa48e849d> chk_limit_user=658001739", len = 89}, user_param_val = {s = 0x0, len = 1}, maddr_val = { s = 0x7fff1565aff0 "\003", len = 3}, method_val = {s = 0x4192b0 "1\355I\211\321^H\211\342H\203\344\360PTI\307\300\200}p", len = 358992512}, lr_val = {s = 0x0, len = 0}, r2_val = { s = 0x7fff1565ae70 "", len = 4380745}, gr_val = {s = 0xffffffff1565ae80 <Address 0xffffffff1565ae80 out of bounds>, len = 4380745}} u = 0x7fff1565b150 port = 0 dst_host = 0x4192b0 i = 11199588 flags = 0 avp = 0x7fb5e4e32d58 st = {flags = 0, id = 0, name = {n = -450750471, s = {s = 0x7fb5e52217f9 "", len = 0}, re = 0x7fb5e52217f9}, avp = 0x59e5922ab0} sct = 0xffffffff sjt = 0x54f361 rve = 0xc33187ed588a53cc mct = 0x7fff1565b0a0 rv = 0x59 rv1 = 0x1ac2053cc c1 = {cache_type = 3851554368, val_type = 32693, c = {avp_val = {n = 358989184, s = {s = 0x7fff1565bd80 "\001", len = 1}, re = 0x7fff1565bd80}, pval = {rs = {s = 0x7fff1565bd80 "\001", len = 1}, ri = -443412928, flags = 32693}}, i2s = "\274\231q\000\000\000\000\000\026:\363\240\264\177\000\000`\002\000\000\000"} s = {s = 0x7fb5e4e3f1b0 "\001", len = 358985252} srevp = {0x59, 0x7fb624eb4ec0} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = { s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, { type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = { number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __FUNCTION__ = "do_action" #3 0x000000000042d849 in run_actions (h=0x7fff1565b230, a=0x7fb5e4e5bea0, msg=0x7fb5e5920e40) at action.c:1548 t = 0x7fb5e4e5bea0 ret = -1 mod = 0x7fff1565bd80 ms = 0 __FUNCTION__ = "run_actions" #4 0x000000000042dedd in run_actions_safe (h=0x7fff1565bd80, a=0x7fb5e4e5bea0, msg=0x7fb5e5920e40) at action.c:1613 ctx = {rec_lev = 1, run_flags = 0, last_retcode = 0, jmp_env = {{__jmpbuf = {3, -4381571508826647604, 4297392, 140733552380544, 0, 0, -4381571508799384628, 4381911880933856204}, __mask_was_saved = 0, __saved_mask = {__val = {5471061, 140733552374672, 140413768858168, 3839733776, 140413811978464, 3, 140419217362496, 140419205825424, 140733552377216, 140733552374672, 2698014181, 0, 3, 4297392, 140733552380544, 0}}}}} ret = 1 ign_on_break = 0 #5 0x000000000054f361 in rval_get_int (h=0x7fff1565bd80, msg=0x7fb5e5920e40, i=0x7fff1565bab0, rv=0x7fb5e4e5c698, cache=0x0) at rvalue.c:912 r_avp = 0xe4e1ce58 avp_val = {n = 358986880, s = {s = 0x7fff1565b480 "P\317\341\344\265\177", len = 0}, re = 0x7fff1565b480} pval = {rs = {s = 0x7fff1565b420 "\340\265e\025\377\177", len = -1596939347}, ri = 4297392, flags = 0} tmp = {s = 0x0, len = 0} s = 0x0 r = 1 ret = 0 destroy_pval = 0 __FUNCTION__ = "rval_get_int" #6 0x00000000005537b9 in rval_expr_eval_int (h=0x7fff1565bd80, msg=0x7fb5e5920e40, res=0x7fff1565bab0, rve=0x7fb5e4e5c690) at rvalue.c:1910 i1 = 1 i2 = 0 ret = -1 c1 = {cache_type = 4297392, val_type = RV_NONE, c = {avp_val = {n = 358992512, s = {s = 0x7fff1565ca80 "\r", len = 0}, re = 0x7fff1565ca80}, pval = {rs = {s = 0x7fff1565ca80 "\r", len = 0}, ri = -443412928, flags = 32693}}, i2s = "\020\331\343\344\265\177\000\000\200\275e\025\377\177\000\000@\016\222\345\265\177"} c2 = {cache_type = RV_CACHE_EMPTY, val_type = RV_NONE, c = {avp_val = {n = 618806060, s = {s = 0x7fb624e23b2c "\200\275\250\372\377\377", len = -1583549560}, re = 0x7fb624e23b2c}, pval = {rs = { s = 0x7fb624e23b2c "\200\275\250\372\377\377", len = -1583549560}, ri = 99, flags = 0}}, i2s = "\377\377\377\377\001\000\000\000X\330\341\344\265\177\000\000ȭ\"\345\265\177"} rv1 = 0x42d849 rv2 = 0x7fff1565b5e0 __FUNCTION__ = "rval_expr_eval_int" #7 0x0000000000420e99 in do_action (h=0x7fff1565bd80, a=0x7fb5e4e5c2b8, msg=0x7fb5e5920e40) at action.c:1029 ret = -5 v = 1 dst = {send_sock = 0x7fb49f2ec1e5, to = {s = {sa_family = 7816, sa_data = "\222\345\265\177\000\000\350K!\345\265\177\000"}, sin = {sin_family = 7816, sin_port = 58770, sin_addr = { s_addr = 32693}, sin_zero = "\350K!\345\265\177\000"}, sin6 = {sin6_family = 7816, sin6_port = 58770, sin6_flowinfo = 32693, sin6_addr = {__in6_u = { __u6_addr8 = "\350K!\345\265\177\000\000\223\215\206\002\000\000\000", __u6_addr16 = {19432, 58657, 32693, 0, 36243, 646, 0, 0}, __u6_addr32 = {3844164584, 32693, 42372499, 0}}}, sin6_scope_id = 42372565}}, id = 0, proto = -36 '\334', send_flags = {f = 141 '\215', blst_imask = 134 '\206'}} tmp = 0x28690ac "" new_uri = 0x7fff1565bbb0 "\220\274e\025\377\177" end = 0x26 <Address 0x26 out of bounds> crt = 0x40000000 <Address 0x40000000 out of bounds> cmd = 0x7fb5e4e07f30 len = 32693 user = -455233520 uri = {user = {s = 0x7fff1565b970 "йe\025\377\177", len = -455233520}, passwd = {s = 0x7fff1565b970 "йe\025\377\177", len = -1626440701}, host = { s = 0x1e00000030 <Address 0x1e00000030 out of bounds>, len = 0}, port = {s = 0x40000000 <Address 0x40000000 out of bounds>, len = 1069135688}, params = { s = 0x6564313231663535 <Address 0x6564313231663535 out of bounds>, len = 6498930}, sip_params = {s = 0x7fff1565b990 "", len = -455233520}, headers = {s = 0x2 <Address 0x2 out of bounds>, len = -455233520}, port_no = 47568, proto = 5477, type = 32767, flags = 3844164584, transport = {s = 0x28690ac "", len = 42372504}, ttl = {s = 0x40000000 <Address 0x40000000 out of bounds>, len = 1061917912}, user_param = {s = 0x5055a98 <Address 0x5055a98 out of bounds>, len = 11823912}, maddr = {s = 0xb47ab0 <Address 0xb47ab0 out of bounds>, len = 8}, method = { s = 0x25 <Address 0x25 out of bounds>, len = 7891776}, lr = {s = 0x7fff1565ba00 "\340\272e\025\377\177", len = 4737794}, r2 = {s = 0x7fb5e5921d20 <incomplete sequence \353>, len = 7845161}, gr = {s = 0x1d00000000 <Address 0x1d00000000 out of bounds>, len = 0}, transport_val = {s = 0x7fff1565bae0 "\220\274e\025\377\177", len = 6481524}, ttl_val = { s = 0x8 <Address 0x8 out of bounds>, len = -455233520}, user_param_val = {s = 0x7fff1565ba80 "\345\301.\237\264\177", len = -1626440701}, maddr_val = {s = 0x7fb5e4ddb010 "\001", len = 0}, method_val = {s = 0x40000000 <Address 0x40000000 out of bounds>, len = 358988432}, lr_val = {s = 0x7fb49f2ec1e5 "16b69a28-55fbd32b-121de-", len = 358988672}, r2_val = { s = 0x786b40 "get_hdr_field", len = 7879820}, gr_val = {s = 0xe8 <Address 0xe8 out of bounds>, len = -455233520}} next_hop = {user = {s = 0x22 <Address 0x22 out of bounds>, len = 7993972}, passwd = {s = 0x7fff1565b7c0 "\240\270e\025\377\177", len = 4737794}, host = {s = 0x0, len = 7845161}, port = { s = 0x800000000 <Address 0x800000000 out of bounds>, len = 0}, params = {s = 0x7fff1565b8a0 "\340\272e\025\377\177", len = 6481524}, sip_params = { s = 0x7fb4a083e6a5 "16b69a28-55fbd32b-121de-", len = -1601968475}, headers = {s = 0x4a083e6a5 <Address 0x4a083e6a5 out of bounds>, len = -1583549549}, port_no = 19432, proto = 58657, type = 32693, flags = 3851558176, transport = {s = 0x7fff1565b9a2 "\005\005", len = 358988195}, ttl = {s = 0x28690ac "", len = 42372565}, user_param = {s = 0x79fa74 "parse_via", len = 7982755}, maddr = {s = 0x40 <Address 0x40 out of bounds>, len = -455233520}, method = {s = 0x7fb5e4ddb010 "\001", len = 0}, lr = {s = 0x7fb5e4ddb010 "\001", len = -455200168}, r2 = { s = 0x5007fb5e5921ce8 <Address 0x5007fb5e5921ce8 out of bounds>, len = 358988188}, gr = {s = 0x4004192b0 <Address 0x4004192b0 out of bounds>, len = 42372528}, transport_val = { s = 0x4004192b0 <Address 0x4004192b0 out of bounds>, len = 42372532}, ttl_val = { s = 0x2868db4 ";alias;branch=z9hG4bK-218503-1-2;rport\r\nFrom: \"658001739\"<sip:658001739@38.106.57.68:5003>;tag=1\r\nTo: \"658001739\"<sip:658001739@38.106.57.68:5003>\r\na9: 2 REGISTER\r\nCall-ID: 1-218503(a)211.78.19.2\r\nMax-F"..., len = 4}, user_param_val = {s = 0x7fff1565bae0 "\220\274e\025\377\177", len = 6942257}, maddr_val = {s = 0x0, len = 0}, method_val = {s = 0x7fb4a03f704c "\t", len = -1604241065}, lr_val = {s = 0x0, len = 0}, r2_val = {s = 0x7fb4a30eb094 "\336!\001", len = 6498930}, gr_val = {s = 0x7fff1565b930 "", len = -455233520}} u = 0x40 port = 0 dst_host = 0x7fff1565bc40 i = 7879820 flags = 0 avp = 0x786b32 st = {flags = 1073741824, id = 0, name = {n = 1061917720, s = {s = 0x3f4b9418 <Address 0x3f4b9418 out of bounds>, len = 11164504}, re = 0x3f4b9418}, avp = 0xb46be8} sct = 0x7fff1565bb20 sjt = 0x648059 rve = 0x7fb5e4e5c690 mct = 0x7fff1565bc90 rv = 0x0 rv1 = 0x146e4ddb010 c1 = {cache_type = 358987600, val_type = 32767, c = {avp_val = {n = -455233520, s = {s = 0x7fb5e4ddb010 "\001", len = 358987648}, re = 0x7fb5e4ddb010}, pval = {rs = {s = 0x7fb5e4ddb010 "\001", len = 358987648}, ri = -455233520, flags = 32693}}, i2s = "\220\267e\025\377\177\000\000\003|\016\237\264\177\000\000\000\000\000@\000"} s = {s = 0x7fff1565b740 "", len = 6498930} srevp = {0x7fff1565b7b0, 0x632a72} mod_f_params = {{type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = { s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, { type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = { number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}, {type = NOSUBTYPE, u = {number = 0, string = 0x0, str = {s = 0x0, len = 0}, data = 0x0, attr = 0x0, select = 0x0}}} __FUNCTION__ = "do_action" #8 0x000000000042d849 in run_actions (h=0x7fff1565bd80, a=0x7fb5e4e1c550, msg=0x7fb5e5920e40) at action.c:1548 t = 0x7fb5e4e5c2b8 ret = 1 mod = 0x2868d8a ms = 0 __FUNCTION__ = "run_actions" #9 0x000000000042dfa5 in run_top_route (a=0x7fb5e4e1c550, msg=0x7fb5e5920e40, c=0x0) at action.c:1634 ctx = {rec_lev = 1, run_flags = 0, last_retcode = 1, jmp_env = {{__jmpbuf = {3, -4381571508384148532, 4297392, 140733552380544, 0, 0, -4381571508340108340, 4381911880933856204}, __mask_was_saved = 0, __saved_mask = {__val = {140413791782471, 4611686022726652592, 3851554368, 4611686022729891907, 0, 140733552377392, 140413791968530, 1, 0, 4611686023081347712, 140419217362496, 140733552377456, 5691780, 4653956720, 140419217362496, 4611686022726652592}}}}} p = 0x7fff1565bd80 ret = 0 sfbk = 0 #10 0x0000000000514651 in receive_msg ( buf=0x2868d70 "REGISTER sip:38.106.57.68 SIP/2.0\r\nVia: SIP/2.0/TCP 211.78.19.2:5060;alias;branch=z9hG4bK-218503-1-2;rport\r\nFrom: \"658001739\"<sip:658001739@38.106.57.68:5003>;tag=1\r\nTo: \"658001739\"<sip:658001739@38.1"..., len=828, rcv_info=0x7fb4a5ae6990) at receive.c:196 msg = 0x7fb5e5920e40 ctx = {rec_lev = 358989904, run_flags = 32767, last_retcode = 0, jmp_env = {{__jmpbuf = {4297392, 140733552380544, 0, 0, 140733552377744, 6290541, 5, 0}, __mask_was_saved = 1, __saved_mask = { __val = {140420280161997, 140733552378808, 140413850511736, 42372448, 140419660776252, 51539623935, 140413850511864, 42949673153, 140413850513313, 140733552380544, 140413850513316, 140733552378016, 6291035, 65536, 4300871118, 65584}}}}} ret = 65536 inb = { s = 0x2868d70 "REGISTER sip:38.106.57.68 SIP/2.0\r\nVia: SIP/2.0/TCP 211.78.19.2:5060;alias;branch=z9hG4bK-218503-1-2;rport\r\nFrom: \"658001739\"<sip:658001739@38.106.57.68:5003>;tag=1\r\nTo: \"658001739\"<sip:658001739@38.1"..., len = 828} __FUNCTION__ = "receive_msg" #11 0x000000000060410a in receive_tcp_msg ( tcpbuf=0x7fb4a5ae6c68 "REGISTER sip:38.106.57.68 SIP/2.0\r\nVia: SIP/2.0/TCP 211.78.19.2:5060;alias;branch=z9hG4bK-218503-1-2;rport\r\nFrom: \"658001739\"<sip:658001739@38.106.57.68:5003>;tag=1\r\nTo: \"658001739\"<sip:658001739@38.1"..., len=828, rcv_info=0x7fb4a5ae6990, con=0x7fb4a5ae6978) at tcp_read.c:1247 buf = 0x2868d70 "REGISTER sip:38.106.57.68 SIP/2.0\r\nVia: SIP/2.0/TCP 211.78.19.2:5060;alias;branch=z9hG4bK-218503-1-2;rport\r\nFrom: \"658001739\"<sip:658001739@38.106.57.68:5003>;tag=1\r\nTo: \"658001739\"<sip:658001739@38.1"... bsize = 65535 blen = 65535 __FUNCTION__ = "receive_tcp_msg" #12 0x0000000000605969 in tcp_read_req (con=0x7fb4a5ae6978, bytes_read=0x7fff1565c3c0, read_flags=0x7fff1565c3b8) at tcp_read.c:1401 bytes = 828 total_bytes = 828 resp = 1 size = 0 req = 0x7fb4a5ae69f8 dst = {send_sock = 0x7fff1565c3b0, to = {s = {sa_family = 8, sa_data = '\000' <repeats 13 times>}, sin = {sin_family = 8, sin_port = 0, sin_addr = {s_addr = 0}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 8, sin6_port = 0, sin6_flowinfo = 0, sin6_addr = {__in6_u = {__u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 358990192}}, id = 32767, proto = 1 '\001', send_flags = {f = 0 '\000', blst_imask = 0 '\000'}} c = 108 'l' ret = -1 __FUNCTION__ = "tcp_read_req" #13 0x0000000000608b6d in handle_io (fm=0x7fb5e523fca0, events=1, idx=-1) at tcp_read.c:1624 ret = 0 n = -1 read_flags = 1 con = 0x7fb4a5ae6978 s = 12 resp = 1 t = 2025289533 __FUNCTION__ = "handle_io" #14 0x00000000005fc0a7 in io_wait_loop_epoll (h=0xa526c0, t=2, repeat=1) at io_wait.h:1061 n = 1 r = 0 fm = 0x7fb5e523fca0 revents = 1 __FUNCTION__ = "io_wait_loop_epoll" #15 0x0000000000609ca8 in tcp_receive_loop (unix_sock=78) at tcp_read.c:1739 __FUNCTION__ = "tcp_receive_loop" #16 0x00000000005f2735 in tcp_init_children () at tcp_main.c:4787 r = 5 i = 23 reader_fd_1 = 78 pid = 0 si_desc = "tcp receiver (generic)\000\000\000\000\000\000\000\000\000\000\240\306e\025\377\177\000\000\367\022Z\000\000\000\000\000\240\306e\025\377\177\000\000.\362B\000\000\000\000\000\200\300\337\344\265\177\000\000\060\323 \345\265\177\000\000\000\000\000\000\001\000\000\000\260\303\336$\266\177\000\000\327nr\000\000\000\000\000\360\025\341\344\265\177\000\000)\000\000\000*\000\000\000\260\222A\000\301!\001" si = 0x0 __FUNCTION__ = "tcp_init_children" #17 0x00000000004afcf8 in main_loop () at main.c:1664 i = 24 pid = 74177 si = 0x0 si_desc = "udp receiver child=23 sock=38.106.57.68:5003\000\177\000\000\200\307e\025\377\177\000\000Z\310b\000\000\000\000\000X\262u\000\000\000\000\000\000\017!f\000\000\000\000\260\222A\000\000\000\000\000\260\304\301\242\264\177\000\000\000\000\000\000\000\000\000\000\360\066!\345\265\177\000\000\320\307e\025\377\177\000\000w9c\000\000\000\000" nrprocs = 24 __FUNCTION__ = "main_loop" #18 0x00000000004b5904 in main (argc=13, argv=0x7fff1565ca88) at main.c:2566 cfg_stream = 0x27bc010 c = -1 r = 0 tmp = 0x7fff1565d7d0 "" tmp_len = 0 port = 0 proto = 32694 options = 0x727900 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:" ret = -1 seed = 2213871821 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x7fff1565c98e p = 0xf0b2ff <Address 0xf0b2ff out of bounds> __FUNCTION__ = "main" quit ``` --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/331

2 6

git:master:cffe6756: tsilo: removed check of use_domain for uri parameter in ts_store()
by Daniel-Constantin Mierla 23 Sep '15

23 Sep '15

Module: kamailio Branch: master Commit: cffe67566f206a6c4e76d76a36e0e1783d056369 URL: https://github.com/kamailio/kamailio/commit/cffe67566f206a6c4e76d76a36e0e17… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-23T01:15:46+02:00 tsilo: removed check of use_domain for uri parameter in ts_store() - ts_append() is using full sip uri and will not match if ts_store() with use_domain=0 will store only username --- Modified: modules/tsilo/ts_store.c Modified: modules/tsilo/tsilo.c --- Diff: https://github.com/kamailio/kamailio/commit/cffe67566f206a6c4e76d76a36e0e17… Patch: https://github.com/kamailio/kamailio/commit/cffe67566f206a6c4e76d76a36e0e17… --- diff --git a/modules/tsilo/ts_store.c b/modules/tsilo/ts_store.c index 2cec2ef..e4f11ba 100644 --- a/modules/tsilo/ts_store.c +++ b/modules/tsilo/ts_store.c @@ -60,19 +60,14 @@ int ts_store(struct sip_msg* msg, str *puri) { } } - if (use_domain) { - aor = suri; - } - else { - if (parse_uri(suri.s, suri.len, &ruri)!=0) - { - LM_ERR("bad uri [%.*s]\n", - suri.len, - suri.s); - return -1; - } - aor = ruri.user; + if (parse_uri(suri.s, suri.len, &ruri)!=0) + { + LM_ERR("bad uri [%.*s]\n", + suri.len, + suri.s); + return -1; } + aor = suri; t = _tmb.t_gett(); if (!t || t==T_UNDEFINED) { diff --git a/modules/tsilo/tsilo.c b/modules/tsilo/tsilo.c index 843804c..411cbc4 100644 --- a/modules/tsilo/tsilo.c +++ b/modules/tsilo/tsilo.c @@ -212,10 +212,21 @@ static void destroy(void) return; } +static int ts_check_uri(str *uri) +{ + struct sip_uri ruri; + if (parse_uri(uri->s, uri->len, &ruri)!=0) + { + LM_ERR("bad uri [%.*s]\n", + uri->len, + uri->s); + return -1; + } + return 0; +} /** * */ - static int fixup_ts_append_to(void** param, int param_no) { if (param_no==1 || param_no==2) { @@ -263,6 +274,8 @@ static int w_ts_append(struct sip_msg* _msg, char *_table, char *_ruri) LM_ERR("invalid ruri parameter\n"); return -1; } + if(ts_check_uri(&ruri)<0) + return -1; return ts_append(_msg, &ruri, _table); } /** @@ -309,6 +322,8 @@ static int w_ts_append_to2(struct sip_msg* msg, char *idx, char *lbl, char *tabl LM_ERR("failed to conert r-uri parameter\n"); return -1; } + if(ts_check_uri(&suri)<0) + return -1; return ts_append_to(msg, tindex, tlabel, table, &suri); }

2 2

crash at f_malloc.c
by Juha Heinanen 23 Sep '15

23 Sep '15

i noticed that my sip proxy running quite recent master had crashed. perhaps this has something to do with recent memory allocation changes? -- juha (gdb) where #0 fm_split_frag (size=104, frag=0x7fa1e3879fe8, qm=0x7fa1e187a000) at mem/f_malloc.c:285 #1 fm_malloc (qmp=0x7fa1e187a000, size=<optimized out>) at mem/f_malloc.c:497 #2 0x00000000005f94eb in fm_shm_malloc (qmp=0x7fa1e187a000, size=97) at mem/f_malloc.c:1059 #3 0x000000000055a67d in create_avp (flags=275, name=..., val=...) at usr_avp.c:175 #4 0x000000000055af4c in add_avp_list (list=0x9faa60 <def_list>, flags=<optimized out>, name=..., val=...) at usr_avp.c:232 #5 0x00007fa1dc898f3d in pv_set_avp (msg=0x7fa1e9ad0ef0, param=0x0, op=-128, val=0x7fff3dbcf7b0) at pv_core.c:1954 #6 0x00000000005444b1 in lval_pvar_assign (lv=<optimized out>, rv=<optimized out>, msg=<optimized out>, h=<optimized out>) at lvalue.c:351 #7 lval_assign (h=0x1, msg=0x7fa1e9ad0ef0, lv=0x7fa1e931fa70, rve=0x7fa1e93202e8) at lvalue.c:399 #8 0x0000000000459a53 in do_action (h=0x7fff3dbd17a0, a=0x7fa1e93209c8, msg=0x7fa1e9ad0ef0) at action.c:1429 #9 0x0000000000458d05 in run_actions (h=0x7fa1e387a068, a=0x68, msg=0xffffffffffffff80) at action.c:1548 #10 0x000000000045a7b6 in do_action (h=0x7fff3dbd17a0, a=0x7fa1e9320ac8, msg=0x7fa1e9ad0ef0) at action.c:1048 #11 0x0000000000458d05 in run_actions (h=0x7fa1e387a068, a=0x68, msg=0xffffffffffffff80) at action.c:1548 #12 0x000000000045a98d in do_action (h=0x7fff3dbd17a0, a=0x7fa1e99442b8, msg=0x7fa1e9ad0ef0) at action.c:677 #13 0x0000000000458d05 in run_actions (h=0x7fa1e387a068, a=0x68, msg=0xffffffffffffff80) at action.c:1548 #14 0x000000000045a7b6 in do_action (h=0x7fff3dbd17a0, a=0x7fa1e920d088, msg=0x7fa1e9ad0ef0) at action.c:1048 #15 0x0000000000458d05 in run_actions (h=0x7fa1e387a068, a=0x68, msg=0xffffffffffffff80) at action.c:1548 #16 0x000000000045a98d in do_action (h=0x7fff3dbd17a0, a=0x7fa1e99442b8, msg=0x7fa1e9ad0ef0) at action.c:677 #17 0x0000000000458d05 in run_actions (h=0x7fa1e387a068, a=0x68, msg=0xffffffffffffff80) at action.c:1548 #18 0x000000000045a7b6 in do_action (h=0x7fff3dbd17a0, a=0x7fa1e91d0b70, msg=0x7fa1e9ad0ef0) at action.c:1048 #19 0x0000000000458d05 in run_actions (h=0x7fa1e387a068, h@entry=0x7fff3dbd17a0, a=0x68, a@entry=0x7fa1e91bc958, msg=0xffffffffffffff80, msg@entry=0x7fa1e9ad0ef0) at action.c:1548 #20 0x0000000000465575 in run_top_route (a=0x7fa1e91bc958, msg=0x7fa1e9ad0ef0, c=<optimized out>) at action.c:1634 ---Type <return> to continue, or q <return> to quit--- #21 0x000000000054692e in receive_msg (buf=0x0, len=104, rcv_info=0x7fa1e1f09e10) at receive.c:195 #22 0x00000000005c28b5 in tcp_read_req (con=0x7fa1e1f09df8, bytes_read=0x7fff3dbd1ae0, read_flags=0x7fff3dbd1ae8) at tcp_read.c:1382 #23 0x00000000005c4d29 in handle_io (fm=0x0, events=104, idx=-1) at tcp_read.c:1624 #24 0x00000000005c994b in io_wait_loop_epoll (h=<optimized out>, t=<optimized out>, repeat=<optimized out>) at io_wait.h:1061 #25 tcp_receive_loop (unix_sock=-477650840) at tcp_read.c:1733 #26 0x00000000004e1f67 in tcp_init_children () at tcp_main.c:4787 #27 0x0000000000513bfb in main_loop () at main.c:1664 #28 0x000000000041c92b in main (argc=0, argv=0x6) at main.c:2566

2 50

git:4.2:7ae59337: domain: proper memset of the hash tables used by domain at init time
by Juha Heinanen 23 Sep '15

23 Sep '15

Module: kamailio Branch: 4.2 Commit: 7ae5933773c9e451c62222c8190539d02db5b448 URL: https://github.com/kamailio/kamailio/commit/7ae5933773c9e451c62222c8190539d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2015-09-23T07:26:59+03:00 domain: proper memset of the hash tables used by domain at init time - discovered on a report by Juha Heinanen (cherry picked from commit 82f74a57229e46e9b9302a6b4caebed6860c47ed) (cherry picked from commit 33939d102b836e440915ce958e90cef36aafec2d) --- Modified: modules/domain/domain_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7ae5933773c9e451c62222c8190539d… Patch: https://github.com/kamailio/kamailio/commit/7ae5933773c9e451c62222c8190539d… --- diff --git a/modules/domain/domain_mod.c b/modules/domain/domain_mod.c index 6a31227..25fdfd1 100644 --- a/modules/domain/domain_mod.c +++ b/modules/domain/domain_mod.c @@ -221,9 +221,9 @@ static int mod_init(void) goto error; } memset(hash_table_1, 0, sizeof(struct domain_list *) * - DOM_HASH_SIZE + 1); + (DOM_HASH_SIZE + 1)); memset(hash_table_2, 0, sizeof(struct domain_list *) * - DOM_HASH_SIZE + 1); + (DOM_HASH_SIZE + 1)); *hash_table = hash_table_1; /* Allocate and initialize locks */

1 0

git:master:de415fd7: tsilo: define the stats in .c file and extern in .h file
by Daniel-Constantin Mierla 22 Sep '15

22 Sep '15

Module: kamailio Branch: master Commit: de415fd7116498bcbab5badad677a74d1313ab6b URL: https://github.com/kamailio/kamailio/commit/de415fd7116498bcbab5badad677a74… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-22T23:45:34+02:00 tsilo: define the stats in .c file and extern in .h file - the .h can be included in many .c files, resulting in multiple declarations of the stats --- Modified: modules/tsilo/ts_hash.h Modified: modules/tsilo/tsilo.c --- Diff: https://github.com/kamailio/kamailio/commit/de415fd7116498bcbab5badad677a74… Patch: https://github.com/kamailio/kamailio/commit/de415fd7116498bcbab5badad677a74… --- diff --git a/modules/tsilo/ts_hash.h b/modules/tsilo/ts_hash.h index c406f57..4dc1f8f 100644 --- a/modules/tsilo/ts_hash.h +++ b/modules/tsilo/ts_hash.h @@ -36,11 +36,11 @@ #define MAX_TS_LOCKS 2048 #define MIN_TS_LOCKS 2 -stat_var *stored_ruris; -stat_var *stored_transactions; -stat_var *total_ruris; -stat_var *total_transactions; -stat_var *added_branches; +extern stat_var *stored_ruris; +extern stat_var *stored_transactions; +extern stat_var *total_ruris; +extern stat_var *total_transactions; +extern stat_var *added_branches; typedef struct ts_transaction { diff --git a/modules/tsilo/tsilo.c b/modules/tsilo/tsilo.c index fe475c6..843804c 100644 --- a/modules/tsilo/tsilo.c +++ b/modules/tsilo/tsilo.c @@ -69,11 +69,11 @@ static int fixup_ts_append(void** param, int param_no); static int w_ts_store(struct sip_msg* msg, char *p1, char *p2); static int w_ts_store1(struct sip_msg* msg, char *_ruri, char *p2); -extern stat_var *stored_ruris; -extern stat_var *stored_transactions; -extern stat_var *total_ruris; -extern stat_var *total_transactions; -extern stat_var *added_branches; +stat_var *stored_ruris; +stat_var *stored_transactions; +stat_var *total_ruris; +stat_var *total_transactions; +stat_var *added_branches; static cmd_export_t cmds[]={ {"ts_append_to", (cmd_function)w_ts_append_to, 3,

1 0

git:4.3:33939d10: domain: proper memset of the hash tables used by domain at init time
by Daniel-Constantin Mierla 22 Sep '15

22 Sep '15

Module: kamailio Branch: 4.3 Commit: 33939d102b836e440915ce958e90cef36aafec2d URL: https://github.com/kamailio/kamailio/commit/33939d102b836e440915ce958e90cef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-22T23:07:11+02:00 domain: proper memset of the hash tables used by domain at init time - discovered on a report by Juha Heinanen (cherry picked from commit 82f74a57229e46e9b9302a6b4caebed6860c47ed) --- Modified: modules/domain/domain_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/33939d102b836e440915ce958e90cef… Patch: https://github.com/kamailio/kamailio/commit/33939d102b836e440915ce958e90cef… --- diff --git a/modules/domain/domain_mod.c b/modules/domain/domain_mod.c index 81f3091..1d567a0 100644 --- a/modules/domain/domain_mod.c +++ b/modules/domain/domain_mod.c @@ -210,9 +210,9 @@ static int mod_init(void) goto error; } memset(hash_table_1, 0, sizeof(struct domain_list *) * - DOM_HASH_SIZE + 1); + (DOM_HASH_SIZE + 1)); memset(hash_table_2, 0, sizeof(struct domain_list *) * - DOM_HASH_SIZE + 1); + (DOM_HASH_SIZE + 1)); *hash_table = hash_table_1; /* Allocate and initialize locks */

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
39
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2015