sr-dev October 2022

sr-dev@lists.kamailio.org

12 participants
201 discussions

git:5.6:c07b6c55: misc/fuzz: add checks on input size
by Daniel-Constantin Mierla 06 Oct '22

06 Oct '22

Module: kamailio Branch: 5.6 Commit: c07b6c55e4cdcc4cf46dafa4431e79a024ca10ec URL: https://github.com/kamailio/kamailio/commit/c07b6c55e4cdcc4cf46dafa4431e79a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-10-06T10:33:23+02:00 misc/fuzz: add checks on input size - test with larger messages than core accepts (cherry picked from commit 1cd2fc1977bfa5e362cef0199e4643085c66d3d1) --- Modified: misc/fuzz/fuzz_parse_msg.c Modified: misc/fuzz/fuzz_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/c07b6c55e4cdcc4cf46dafa4431e79a… Patch: https://github.com/kamailio/kamailio/commit/c07b6c55e4cdcc4cf46dafa4431e79a… --- diff --git a/misc/fuzz/fuzz_parse_msg.c b/misc/fuzz/fuzz_parse_msg.c index e20c2e64f3a..80fe75a226b 100644 --- a/misc/fuzz/fuzz_parse_msg.c +++ b/misc/fuzz/fuzz_parse_msg.c @@ -1,3 +1,4 @@ +#include "../config.h" #include "../parser/sdp/sdp.h" #include "../parser/parse_uri.c" #include "../parser/parse_hname2.h" @@ -23,6 +24,11 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { orig_inv.buf = (char*)data; orig_inv.len = size; + if(size >= 4*BUF_SIZE) { + /* test with larger message than core accepts, but not indefinitely large */ + return 0; + } + if (parse_msg(orig_inv.buf, orig_inv.len, &orig_inv) < 0) { goto cleanup; } diff --git a/misc/fuzz/fuzz_uri.c b/misc/fuzz/fuzz_uri.c index 9418d6eed4d..3cc6dec061f 100644 --- a/misc/fuzz/fuzz_uri.c +++ b/misc/fuzz/fuzz_uri.c @@ -1,8 +1,14 @@ + +#include "../config.h" #include "../parser/parse_uri.c" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { struct sip_uri uri; + if(size >= BUF_SIZE) { + /* test with larger message than core accepts, but not indefinitely large */ + return 0; + } parse_uri(data, size, &uri); return 0; }

1 0

git:5.6:19aab189: corex: added fixup free functions in module exports
by Daniel-Constantin Mierla 06 Oct '22

06 Oct '22

Module: kamailio Branch: 5.6 Commit: 19aab1894ba88bc7152e00a84819d991937665a6 URL: https://github.com/kamailio/kamailio/commit/19aab1894ba88bc7152e00a84819d99… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-10-06T10:33:01+02:00 corex: added fixup free functions in module exports (cherry picked from commit d5ae9019dcdfe5b51ce87f6957902abbaa7fa071) --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/19aab1894ba88bc7152e00a84819d99… Patch: https://github.com/kamailio/kamailio/commit/19aab1894ba88bc7152e00a84819d99… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 3c6b6a59f41..7e61f1f93d7 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -112,59 +112,59 @@ static cmd_export_t cmds[]={ {"append_branch", (cmd_function)w_append_branch, 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE }, {"append_branch", (cmd_function)w_append_branch, 1, fixup_spve_null, - 0, REQUEST_ROUTE | FAILURE_ROUTE }, + fixup_free_spve_null, REQUEST_ROUTE | FAILURE_ROUTE }, {"append_branch", (cmd_function)w_append_branch, 2, fixup_spve_spve, - 0, REQUEST_ROUTE | FAILURE_ROUTE }, + fixup_free_spve_spve, REQUEST_ROUTE | FAILURE_ROUTE }, {"send_udp", (cmd_function)w_send_udp, 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE }, {"send_udp", (cmd_function)w_send_udp, 1, fixup_spve_null, - 0, REQUEST_ROUTE | FAILURE_ROUTE }, + fixup_free_spve_null, REQUEST_ROUTE | FAILURE_ROUTE }, {"send_tcp", (cmd_function)w_send_tcp, 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE }, {"send_tcp", (cmd_function)w_send_tcp, 1, fixup_spve_null, - 0, REQUEST_ROUTE | FAILURE_ROUTE }, + fixup_free_spve_null, REQUEST_ROUTE | FAILURE_ROUTE }, {"send_data", (cmd_function)w_send_data, 2, fixup_spve_spve, - 0, ANY_ROUTE }, + fixup_free_spve_spve, ANY_ROUTE }, {"sendx", (cmd_function)w_sendx, 3, fixup_spve_all, - 0, ANY_ROUTE }, + fixup_free_spve_all, ANY_ROUTE }, {"is_incoming", (cmd_function)nio_check_incoming, 0, 0, 0, ANY_ROUTE }, {"msg_iflag_set", (cmd_function)w_msg_iflag_set, 1, fixup_spve_null, - 0, ANY_ROUTE }, + fixup_free_spve_null, ANY_ROUTE }, {"msg_iflag_reset", (cmd_function)w_msg_iflag_reset, 1, fixup_spve_null, - 0, ANY_ROUTE }, + fixup_free_spve_null, ANY_ROUTE }, {"msg_iflag_is_set", (cmd_function)w_msg_iflag_is_set, 1, fixup_spve_null, - 0, ANY_ROUTE }, + fixup_free_spve_null, ANY_ROUTE }, {"file_read", (cmd_function)w_file_read, 2, fixup_file_op, 0, ANY_ROUTE }, {"file_write", (cmd_function)w_file_write, 2, fixup_spve_spve, - 0, ANY_ROUTE }, - {"setxflag", (cmd_function)w_setxflag, 1,fixup_igp_null, - 0, ANY_ROUTE }, - {"resetxflag", (cmd_function)w_resetxflag, 1,fixup_igp_null, - 0, ANY_ROUTE }, - {"isxflagset", (cmd_function)w_isxflagset, 1,fixup_igp_null, - 0, ANY_ROUTE }, + fixup_free_spve_spve, ANY_ROUTE }, + {"setxflag", (cmd_function)w_setxflag, 1, fixup_igp_null, + fixup_free_igp_null, ANY_ROUTE }, + {"resetxflag", (cmd_function)w_resetxflag, 1, fixup_igp_null, + fixup_free_igp_null, ANY_ROUTE }, + {"isxflagset", (cmd_function)w_isxflagset, 1, fixup_igp_null, + fixup_free_igp_null, ANY_ROUTE }, {"set_send_socket", (cmd_function)w_set_send_socket, 1, fixup_spve_null, - 0, ANY_ROUTE }, + fixup_free_spve_null, ANY_ROUTE }, {"set_send_socket_name", (cmd_function)w_set_send_socket_name, 1, fixup_spve_null, - 0, ANY_ROUTE }, + fixup_free_spve_null, ANY_ROUTE }, {"set_recv_socket", (cmd_function)w_set_recv_socket, 1, fixup_spve_null, - 0, ANY_ROUTE }, + fixup_free_spve_null, ANY_ROUTE }, {"set_recv_socket_name", (cmd_function)w_set_recv_socket_name, 1, fixup_spve_null, - 0, ANY_ROUTE }, + fixup_free_spve_null, ANY_ROUTE }, {"set_source_address", (cmd_function)w_set_source_address, 1, fixup_spve_null, - 0, ANY_ROUTE }, + fixup_free_spve_null, ANY_ROUTE }, {"via_add_srvid", (cmd_function)w_via_add_srvid, 1, fixup_igp_null, - 0, ANY_ROUTE }, + fixup_free_igp_null, ANY_ROUTE }, {"via_add_xavp_params", (cmd_function)w_via_add_xavp_params, 1, fixup_igp_null, - 0, ANY_ROUTE }, + fixup_free_igp_null, ANY_ROUTE }, {"via_use_xavp_fields", (cmd_function)w_via_use_xavp_fields, 1, fixup_igp_null, - 0, ANY_ROUTE }, + fixup_free_igp_null, ANY_ROUTE }, {"is_faked_msg", (cmd_function)w_is_faked_msg, 0, 0, 0, ANY_ROUTE }, {"is_socket_name", (cmd_function)w_is_socket_name, 1, fixup_spve_null, - 0, ANY_ROUTE }, + fixup_free_spve_null, ANY_ROUTE }, {0, 0, 0, 0, 0, 0} };

1 0

Releasing v5.6.2
by Daniel-Constantin Mierla 06 Oct '22

06 Oct '22

Hello, I am considering to release Kamailio v5.6.2 (out of branch 5.6) later this week (likely on Thursday, Nov 6, 2022). If anyone is aware of issues not yet on the bug tracker, report them there asap in order to have a better chance to be fixed. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online Nov 7-10, 2022 (Europe Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

1 1

git:master:598969df: misctest: allow testing with larger message size than core accepts
by Daniel-Constantin Mierla 05 Oct '22

05 Oct '22

Module: kamailio Branch: master Commit: 598969df126af4ad4d2283e37078e1afe8773a32 URL: https://github.com/kamailio/kamailio/commit/598969df126af4ad4d2283e37078e1a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-10-05T10:41:38+02:00 misctest: allow testing with larger message size than core accepts --- Modified: src/modules/misctest/misctest_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/598969df126af4ad4d2283e37078e1a… Patch: https://github.com/kamailio/kamailio/commit/598969df126af4ad4d2283e37078e1a… --- diff --git a/src/modules/misctest/misctest_mod.c b/src/modules/misctest/misctest_mod.c index c00a8b9c5c0..e0108b5a76b 100644 --- a/src/modules/misctest/misctest_mod.c +++ b/src/modules/misctest/misctest_mod.c @@ -265,13 +265,13 @@ static int misctest_memory_init(void) static int misctest_message_init(void) { - char tbuf[BUF_SIZE]; + char tbuf[4*BUF_SIZE]; FILE *f; long fsize; sip_msg_t tmsg = { }; if(misctest_message_data.s!=0 && misctest_message_data.len>0) { - if(misctest_message_data.len>=BUF_SIZE-2) { + if(misctest_message_data.len>=4*BUF_SIZE-2) { LM_ERR("the data is too big\n"); return -1; } @@ -297,7 +297,7 @@ static int misctest_message_init(void) } fseek(f, 0, SEEK_SET); - if(fsize>=BUF_SIZE-2) { + if(fsize>=4*BUF_SIZE-2) { LM_ERR("the file data is too big\n"); fclose(f); return -1;

1 0

git:master:916ecb43: misc/fuzz/README.md: added link to OSS-Fuzz folder for Kamailio
by Daniel-Constantin Mierla 05 Oct '22

05 Oct '22

Module: kamailio Branch: master Commit: 916ecb43e94fcc4662ae4212172b2b66488002de URL: https://github.com/kamailio/kamailio/commit/916ecb43e94fcc4662ae4212172b2b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-10-05T10:37:01+02:00 misc/fuzz/README.md: added link to OSS-Fuzz folder for Kamailio --- Modified: misc/fuzz/README.md --- Diff: https://github.com/kamailio/kamailio/commit/916ecb43e94fcc4662ae4212172b2b6… Patch: https://github.com/kamailio/kamailio/commit/916ecb43e94fcc4662ae4212172b2b6… --- diff --git a/misc/fuzz/README.md b/misc/fuzz/README.md index bc0238f56c..72dcc17072 100644 --- a/misc/fuzz/README.md +++ b/misc/fuzz/README.md @@ -5,6 +5,10 @@ various open source projects. * https://github.com/google/oss-fuzz +Folder for Kamailio project on OSS-Fuzz: + + * https://github.com/google/oss-fuzz/tree/master/projects/kamailio + OSS-Fuzz pull request to integrate Kamailio: * https://github.com/google/oss-fuzz/pull/5279

1 0

git:master:1cd2fc19: misc/fuzz: add checks on input size
by Daniel-Constantin Mierla 05 Oct '22

05 Oct '22

Module: kamailio Branch: master Commit: 1cd2fc1977bfa5e362cef0199e4643085c66d3d1 URL: https://github.com/kamailio/kamailio/commit/1cd2fc1977bfa5e362cef0199e46430… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-10-05T10:34:43+02:00 misc/fuzz: add checks on input size - test with larger messages than core accepts --- Modified: misc/fuzz/fuzz_parse_msg.c Modified: misc/fuzz/fuzz_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/1cd2fc1977bfa5e362cef0199e46430… Patch: https://github.com/kamailio/kamailio/commit/1cd2fc1977bfa5e362cef0199e46430… --- diff --git a/misc/fuzz/fuzz_parse_msg.c b/misc/fuzz/fuzz_parse_msg.c index e20c2e64f3a..80fe75a226b 100644 --- a/misc/fuzz/fuzz_parse_msg.c +++ b/misc/fuzz/fuzz_parse_msg.c @@ -1,3 +1,4 @@ +#include "../config.h" #include "../parser/sdp/sdp.h" #include "../parser/parse_uri.c" #include "../parser/parse_hname2.h" @@ -23,6 +24,11 @@ LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { orig_inv.buf = (char*)data; orig_inv.len = size; + if(size >= 4*BUF_SIZE) { + /* test with larger message than core accepts, but not indefinitely large */ + return 0; + } + if (parse_msg(orig_inv.buf, orig_inv.len, &orig_inv) < 0) { goto cleanup; } diff --git a/misc/fuzz/fuzz_uri.c b/misc/fuzz/fuzz_uri.c index 9418d6eed4d..3cc6dec061f 100644 --- a/misc/fuzz/fuzz_uri.c +++ b/misc/fuzz/fuzz_uri.c @@ -1,8 +1,14 @@ + +#include "../config.h" #include "../parser/parse_uri.c" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { struct sip_uri uri; + if(size >= BUF_SIZE) { + /* test with larger message than core accepts, but not indefinitely large */ + return 0; + } parse_uri(data, size, &uri); return 0; }

1 0

git:master:45c4c1b1: lrkproxy: init variable and check to fix compiler warnings
by Daniel-Constantin Mierla 04 Oct '22

04 Oct '22

Module: kamailio Branch: master Commit: 45c4c1b1851212bfc8e0c84d4e1a62cd89ad7b56 URL: https://github.com/kamailio/kamailio/commit/45c4c1b1851212bfc8e0c84d4e1a62c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-10-04T16:12:17+02:00 lrkproxy: init variable and check to fix compiler warnings --- Modified: src/modules/lrkproxy/lrkproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/45c4c1b1851212bfc8e0c84d4e1a62c… Patch: https://github.com/kamailio/kamailio/commit/45c4c1b1851212bfc8e0c84d4e1a62c… --- diff --git a/src/modules/lrkproxy/lrkproxy.c b/src/modules/lrkproxy/lrkproxy.c index e673ffed63..cdd69bf75e 100644 --- a/src/modules/lrkproxy/lrkproxy.c +++ b/src/modules/lrkproxy/lrkproxy.c @@ -1290,7 +1290,7 @@ static struct lrkp_set * select_lrkp_set(int id_set ){ struct lrkp_node *select_lrkp_node(int do_test) { - struct lrkp_node* node; + struct lrkp_node* node = NULL; int was_forced; int was_forced2; @@ -1391,7 +1391,7 @@ struct lrkp_node *select_lrkp_node(int do_test) } found: - if (do_test) { + if (do_test && node) { // //todo... node->ln_enable = lrkp_test(node); if (!node->ln_enable)

1 0

git:master:640456bb: modules: readme files regenerated - jsonrpcs ... [skip ci]
by Kamailio Dev 04 Oct '22

04 Oct '22

Module: kamailio Branch: master Commit: 640456bb13cd9da3ff84ca3542f9f28446062d7c URL: https://github.com/kamailio/kamailio/commit/640456bb13cd9da3ff84ca3542f9f28… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2022-10-04T12:01:46+02:00 modules: readme files regenerated - jsonrpcs ... [skip ci] --- Modified: src/modules/jsonrpcs/README --- Diff: https://github.com/kamailio/kamailio/commit/640456bb13cd9da3ff84ca3542f9f28… Patch: https://github.com/kamailio/kamailio/commit/640456bb13cd9da3ff84ca3542f9f28… --- diff --git a/src/modules/jsonrpcs/README b/src/modules/jsonrpcs/README index a16d628fae..0b9465dfa1 100644 --- a/src/modules/jsonrpcs/README +++ b/src/modules/jsonrpcs/README @@ -71,7 +71,7 @@ Daniel-Constantin Mierla 1.15. jsonrpc_exec usage 1.16. JSONRPC Commands - Examples 1.17. JSONRPC Over Fifo Command - 1.18. JSONRPC Over Fifo Command From Termina + 1.18. JSONRPC Over Fifo Command From Terminal Chapter 1. Admin Guide @@ -494,7 +494,7 @@ xlog("jsonrpc response code: $jsonrpl(code) - the body is: $jsonrpl(body)\n"); Next is an example of how to test it from a terminal, assuming that the parameter 'fifo_name' is set to '/tmp/kamailio_jsonrpc_fifo'. - Example 1.18. JSONRPC Over Fifo Command From Termina + Example 1.18. JSONRPC Over Fifo Command From Terminal ... mkfifo /tmp/kamailio_jsonrpc_reply_fifo cat /tmp/kamailio_jsonrpc_reply_fifo &

1 0

git:master:758ec768: jsonrpcs: small spelling fix in docs
by Henning Westerholt 04 Oct '22

04 Oct '22

Module: kamailio Branch: master Commit: 758ec768576cf4e380d6cd7f678f6270f79033af URL: https://github.com/kamailio/kamailio/commit/758ec768576cf4e380d6cd7f678f627… Author: Henning Westerholt <hw(a)gilawa.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2022-10-04T09:50:08Z jsonrpcs: small spelling fix in docs --- Modified: src/modules/jsonrpcs/doc/jsonrpcs_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/758ec768576cf4e380d6cd7f678f627… Patch: https://github.com/kamailio/kamailio/commit/758ec768576cf4e380d6cd7f678f627… --- diff --git a/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml b/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml index cd8691af09a..fe18a4a76d7 100644 --- a/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml +++ b/src/modules/jsonrpcs/doc/jsonrpcs_admin.xml @@ -582,7 +582,7 @@ xlog("jsonrpc response code: $jsonrpl(code) - the body is: $jsonrpl(body)\n"); the parameter 'fifo_name' is set to '/tmp/kamailio_jsonrpc_fifo'. </para> <example> - <title>JSONRPC Over Fifo Command From Termina</title> + <title>JSONRPC Over Fifo Command From Terminal</title> <programlisting format="linespecific"> ... mkfifo /tmp/kamailio_jsonrpc_reply_fifo

1 0

[kamailio/kamailio] segfault at f8 ip 00007fd49cf02f72 sp 00007ffea6e37e70 error 4 in dmq_usrloc.so[7fd49cef0000+17000] (Issue #3242)
by Joel Serrano 04 Oct '22

04 Oct '22

### Description We have a cluster of two Kamailio nodes on Debian 10 + v5.5.2. We have added a node and updated to v5.6.1. So now it's a cluster of: 2x debian10 + v5.6.1 1x debian11 + v5.6.1 ### Troubleshooting I'm not sure what is the issue but per `dmesg` logs it seems related to `dmq_usrloc` module. We have a lot of cores, so it's happening constantly since the upgrade and the extra node addition. #### Debugging Data [core.kamailio.53605.1663462643.txt](https://github.com/kamailio/kamailio/fi… #### Log Messages  ``` [155017.987497] kamailio[53605]: segfault at f8 ip 00007fd49cf02f72 sp 00007ffea6e37e70 error 4 in dmq_usrloc.so[7fd49cef0000+17000] [155017.987527] Code: 40 38 01 d0 89 05 12 95 00 00 48 8b 05 cf 8f 00 00 8b 00 83 f8 01 0f 85 80 00 00 00 48 8b 85 48 ff ff ff 48 8b 80 a0 00 00 00 <8b> 90 f8 00 00 00 48 8b 85 48 ff ff ff 48 8b 80 a0 00 00 00 48 8b ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.6.1 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLOCKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 10.2.1 ``` * **Operating System**:  ``` No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 11 (bullseye) Release: 11 Codename: bullseye Linux sip03.example.com 5.18.0-0.deb11.4-amd64 #1 SMP PREEMPT_DYNAMIC Debian 5.18.16-1~bpo11+1 (2022-08-12) x86_64 GNU/Linux ``` -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3242 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3242(a)github.com>

2 8

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2022