sr-dev

sr-dev@lists.kamailio.org

22 participants
45186 discussions

git:5.4:99b2a0c0: core: more comments about data lump structure fields and options
by Daniel-Constantin Mierla 10 Sep '20

10 Sep '20

Module: kamailio Branch: 5.4 Commit: 99b2a0c066bcc35425b3a2bc73158711bba70b70 URL: https://github.com/kamailio/kamailio/commit/99b2a0c066bcc35425b3a2bc7315871… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-10T09:43:48+02:00 core: more comments about data lump structure fields and options (cherry picked from commit b13431b6fc7eec20096c5be46c8ce2e43931c45f) --- Modified: src/core/lump_struct.h --- Diff: https://github.com/kamailio/kamailio/commit/99b2a0c066bcc35425b3a2bc7315871… Patch: https://github.com/kamailio/kamailio/commit/99b2a0c066bcc35425b3a2bc7315871…

1 0

Releasing v5.3.6
by Daniel-Constantin Mierla 10 Sep '20

10 Sep '20

Hello, I am considering to release v5.3.6 from the branch 5.3 in the next days, aiming from Thursday (Sep 10, 2020) if everything goes as planned at this moment, or on Monday (Sep 14, 2020) if a little bit of time is needed. Should you be aware of any issue that needs to be addressed in the branch 5.3 (e.g., a bug, or a missing backport), inform us as soon as possible to try to sort it out in time. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Funding: https://www.paypal.me/dcmierla

1 1

[kamailio/kamailio] Segmentation fault in rpc_mod_print function while shutting down server. (#2433)
by Andrey Deykunov 09 Sep '20

09 Sep '20

### Description We have segfault in Kamailio v5.3.1 installed on Debain 9.x 64 bit occured while kamailio was shutting down while our script tryed to get metric using kamcmd utility at the same time. ### Troubleshooting No troubleshooting was done, since it happened on a production server. We simply restarted the server. #### Reproduction The problem periodically happens on production servers during restart. Kamailio crashes when one of our scripts tried getting statistics about websocket and tls modules using kamcmd during server restart. As I see in core dump, shared memory was already freed when rpc_mod_print called in the child process. #### Debugging Data  ``` core.kamailio.17684 /var/lib/ums/sbin/kamailio GNU gdb (Debian 7.12-6) 7.12.0.20161007-git Copyright (C) 2016 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-linux-gnu". Type "show configuration" for configuration details. For bug reporting instructions, please see: <http://www.gnu.org/software/gdb/bugs/>. Find the GDB manual and other documentation resources online at: <http://www.gnu.org/software/gdb/documentation/>. For help, type "help". Type "apropos word" to search for commands related to "word"... Reading symbols from /var/lib/ums/sbin/kamailio...done. [New LWP 17684] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". Core was generated by `/var/lib/ums/sbin/kamailio -m 2048 -M 12 -P /var/run/kamailio/kamailio.pid -f /'. Program terminated with signal SIGSEGV, Segmentation fault. #0 __strcmp_ssse3 () at ../sysdeps/x86_64/multiarch/../strcmp.S:1197 #0 __strcmp_ssse3 () at ../sysdeps/x86_64/multiarch/../strcmp.S:1197 #1 0x00007ff4d6ddb2f5 in rpc_mod_print (rpc=0x7ff4d66f0540 <binrpc_callbacks>, ctx=0x7fff11cd5658, mname=0x1f140b8 "tls", stats=0x1f2f180, flag=2) at mod_stats.c:117 #2 0x00007ff4d6ddb0eb in rpc_mod_print_one (rpc=0x7ff4d66f0540 <binrpc_callbacks>, ctx=0x7fff11cd5658, mname=0x1f140b8 "tls", pkg_stats=0x1f2d9c0, shm_stats=0x1f2f180, flag=2) at mod_stats.c:159 #3 0x00007ff4d6ddaee1 in rpc_mod_mem_stats_mode (rpc=0x7ff4d66f0540 <binrpc_callbacks>, ctx=0x7fff11cd5658, fmode=0) at mod_stats.c:239 #4 0x00007ff4d6dda84f in rpc_mod_mem_stats (rpc=0x7ff4d66f0540 <binrpc_callbacks>, ctx=0x7fff11cd5658) at mod_stats.c:251 #5 0x00007ff4d64bfc80 in process_rpc_req (buf=0x1f140a4 "\241\003\026t\256\214=\221\nmod.stats", size=29, bytes_needed=0x7fff11cd5aa0, sh=0x7fff11cd5a10, saved_state=0x1f240a8) at binrpc_run.c:678 #6 0x00007ff4d64ad72f in handle_stream_read (s_c=0x1f14070, idx=-1) at io_listener.c:511 #7 0x00007ff4d64a9121 in handle_io (fm=0x7ff55a4e4ae0, events=1, idx=-1) at io_listener.c:706 #8 0x00007ff4d64a793a in io_wait_loop_epoll (h=0x7ff4d66f0348 <io_h>, t=10, repeat=0) at ./../../core/io_wait.h:1062 #9 0x00007ff4d649b62c in io_listen_loop (fd_no=2, cs_lst=0x1e28940) at io_listener.c:281 #10 0x00007ff4d64d172c in mod_child (rank=0) at ctl.c:338 #11 0x0000000000638c14 in init_mod_child (m=0x7ff55a3634b0, rank=0) at core/sr_module.c:780 #12 0x000000000063862d in init_mod_child (m=0x7ff55a363b78, rank=0) at core/sr_module.c:776 #13 0x000000000063862d in init_mod_child (m=0x7ff55a364018, rank=0) at core/sr_module.c:776 #14 0x000000000063862d in init_mod_child (m=0x7ff55a364528, rank=0) at core/sr_module.c:776 #15 0x000000000063862d in init_mod_child (m=0x7ff55a3649c8, rank=0) at core/sr_module.c:776 #16 0x000000000063862d in init_mod_child (m=0x7ff55a365140, rank=0) at core/sr_module.c:776 #17 0x000000000063862d in init_mod_child (m=0x7ff55a3657b0, rank=0) at core/sr_module.c:776 #18 0x000000000063862d in init_mod_child (m=0x7ff55a365c38, rank=0) at core/sr_module.c:776 #19 0x00000000006385b2 in init_child (rank=0) at core/sr_module.c:825 #20 0x000000000043140c in main_loop () at main.c:1753 #21 0x000000000043df6f in main (argc=9, argv=0x7fff11cd9dd8) at main.c:2802 ``` #### Log Messages No any useful logs available. #### SIP Traffic No SIP traffic available. ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.1 (x86_64/linux) 283e46 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_BLACKLIST, HAVE_RESOLV_RES 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: 283e46 compiled on 14:23:37 Jul 28 2020 with clang 9.0 ``` * **Operating System**:  ``` Linux devhpbx005-1.vx 4.9.0-12-amd64 #1 SMP Debian 4.9.210-1 (2020-01-20) x86_64 GNU/Linux ``` -- 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/2433

2 14

git:master:9645be24: core: mem - use own functions for shm mod stats get operation
by Daniel-Constantin Mierla 09 Sep '20

09 Sep '20

Module: kamailio Branch: master Commit: 9645be245f899fa8ae11a6be045d2ef83fd66bf5 URL: https://github.com/kamailio/kamailio/commit/9645be245f899fa8ae11a6be045d2ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-09T18:44:46+02:00 core: mem - use own functions for shm mod stats get operation - protect with global lock for shm stats --- Modified: src/core/mem/f_malloc.c Modified: src/core/mem/q_malloc.c Modified: src/core/mem/tlsf_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/9645be245f899fa8ae11a6be045d2ef… Patch: https://github.com/kamailio/kamailio/commit/9645be245f899fa8ae11a6be045d2ef… --- diff --git a/src/core/mem/f_malloc.c b/src/core/mem/f_malloc.c index 2363700c0b..38f686ff2c 100644 --- a/src/core/mem/f_malloc.c +++ b/src/core/mem/f_malloc.c @@ -1367,6 +1367,16 @@ void fm_shm_sums(void* qmp) fm_sums(qmp); fm_shm_unlock(); } +void fm_shm_mod_get_stats(void *qmp, void **qm_rootp) +{ + fm_shm_lock(); + fm_mod_get_stats(qmp, qm_rootp); + fm_shm_unlock(); +} +void fm_shm_mod_free_stats(void *qm_rootp) +{ + fm_mod_free_stats(qm_rootp); +} /** @@ -1413,8 +1423,8 @@ int fm_malloc_init_shm_manager(void) ma.xavailable = fm_shm_available; ma.xsums = fm_shm_sums; ma.xdestroy = fm_malloc_destroy_shm_manager; - ma.xmodstats = fm_mod_get_stats; - ma.xfmodstats = fm_mod_free_stats; + ma.xmodstats = fm_shm_mod_get_stats; + ma.xfmodstats = fm_shm_mod_free_stats; ma.xglock = fm_shm_glock; ma.xgunlock = fm_shm_gunlock; diff --git a/src/core/mem/q_malloc.c b/src/core/mem/q_malloc.c index b518bfab81..94f972eae9 100644 --- a/src/core/mem/q_malloc.c +++ b/src/core/mem/q_malloc.c @@ -1350,7 +1350,16 @@ void qm_shm_sums(void* qmp) qm_sums(qmp); qm_shm_unlock(); } - +void qm_shm_mod_get_stats(void *qmp, void **qm_rootp) +{ + qm_shm_lock(); + qm_mod_get_stats(qmp, qm_rootp); + qm_shm_unlock(); +} +void qm_shm_mod_free_stats(void *qm_rootp) +{ + qm_mod_free_stats(qm_rootp); +} /** * \brief Destroy memory pool @@ -1396,8 +1405,8 @@ int qm_malloc_init_shm_manager(void) ma.xavailable = qm_shm_available; ma.xsums = qm_shm_sums; ma.xdestroy = qm_malloc_destroy_shm_manager; - ma.xmodstats = qm_mod_get_stats; - ma.xfmodstats = qm_mod_free_stats; + ma.xmodstats = qm_shm_mod_get_stats; + ma.xfmodstats = qm_shm_mod_free_stats; ma.xglock = qm_shm_glock; ma.xgunlock = qm_shm_gunlock; diff --git a/src/core/mem/tlsf_malloc.c b/src/core/mem/tlsf_malloc.c index 33bbf4869d..10db30264b 100644 --- a/src/core/mem/tlsf_malloc.c +++ b/src/core/mem/tlsf_malloc.c @@ -1607,6 +1607,16 @@ void tlsf_shm_sums(void* tlsfmp) tlsf_sums(tlsfmp); tlsf_shm_unlock(); } +void tlsf_shm_mod_get_stats(void *qmp, void **qm_rootp) +{ + tlsf_shm_lock(); + tlsf_mod_get_stats(qmp, qm_rootp); + tlsf_shm_unlock(); +} +void tlsf_shm_mod_free_stats(void *qm_rootp) +{ + tlsf_mod_free_stats(qm_rootp); +} /** @@ -1653,8 +1663,8 @@ int tlsf_malloc_init_shm_manager(void) ma.xavailable = tlsf_shm_available; ma.xsums = tlsf_shm_sums; ma.xdestroy = tlsf_malloc_destroy_shm_manager; - ma.xmodstats = tlsf_mod_get_stats; - ma.xfmodstats = tlsf_mod_free_stats; + ma.xmodstats = tlsf_shm_mod_get_stats; + ma.xfmodstats = tlsf_shm_mod_free_stats; ma.xglock = tlsf_shm_glock; ma.xgunlock = tlsf_shm_gunlock;

1 0

git:master:aa458a62: core: mem - define mem_counter struct in meminfo
by Daniel-Constantin Mierla 09 Sep '20

09 Sep '20

Module: kamailio Branch: master Commit: aa458a62f034c2cb57639bdc713ed3c51b0292c7 URL: https://github.com/kamailio/kamailio/commit/aa458a62f034c2cb57639bdc713ed3c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-09T17:50:24+02:00 core: mem - define mem_counter struct in meminfo - it is the same for f/q/tlsf mallocs --- Modified: src/core/mem/f_malloc.h Modified: src/core/mem/meminfo.h Modified: src/core/mem/q_malloc.h Modified: src/core/mem/tlsf_malloc.h --- Diff: https://github.com/kamailio/kamailio/commit/aa458a62f034c2cb57639bdc713ed3c… Patch: https://github.com/kamailio/kamailio/commit/aa458a62f034c2cb57639bdc713ed3c… --- diff --git a/src/core/mem/f_malloc.h b/src/core/mem/f_malloc.h index d338f5c5d3..2bed0b8e53 100644 --- a/src/core/mem/f_malloc.h +++ b/src/core/mem/f_malloc.h @@ -241,17 +241,5 @@ void fm_sums(void* qmp); void fm_mod_get_stats(void* qm, void **fm_root); void fm_mod_free_stats(void *root); -typedef struct _mem_counter{ - const char *file; - const char *func; - const char *mname; - unsigned long line; - - unsigned long size; - int count; - - struct _mem_counter *next; -} mem_counter; - #endif #endif diff --git a/src/core/mem/meminfo.h b/src/core/mem/meminfo.h index 9c7760db34..8b69daa705 100644 --- a/src/core/mem/meminfo.h +++ b/src/core/mem/meminfo.h @@ -42,5 +42,17 @@ struct mem_info{ unsigned long total_frags; /** number of total memory fragments */ }; +typedef struct _mem_counter{ + const char *file; + const char *func; + const char *mname; + unsigned long line; + + unsigned long size; + int count; + + struct _mem_counter *next; +} mem_counter; + #endif diff --git a/src/core/mem/q_malloc.h b/src/core/mem/q_malloc.h index 71e248f527..85d3c86e60 100644 --- a/src/core/mem/q_malloc.h +++ b/src/core/mem/q_malloc.h @@ -174,17 +174,5 @@ void qm_sums(void* qm); void qm_mod_get_stats(void *qm, void **qm_root); void qm_mod_free_stats(void *root); -typedef struct _mem_counter{ - const char *file; - const char *func; - const char *mname; - unsigned long line; - - unsigned long size; - int count; - - struct _mem_counter *next; -} mem_counter; - #endif #endif diff --git a/src/core/mem/tlsf_malloc.h b/src/core/mem/tlsf_malloc.h index 3fce9cd1e9..4112634b95 100644 --- a/src/core/mem/tlsf_malloc.h +++ b/src/core/mem/tlsf_malloc.h @@ -89,18 +89,6 @@ unsigned long tlsf_available(tlsf_t pool); void tlsf_mod_get_stats(tlsf_t pool, void **root); void tlsf_mod_free_stats(void *root); -typedef struct _mem_counter{ - const char *file; - const char *func; - const char *mname; - unsigned long line; - - unsigned long size; - int count; - - struct _mem_counter *next; -} mem_counter; - #if defined(__cplusplus) }; #endif

1 0

git:master:761eb061: kex: use mutex to sync the mod mem stats rpc commands
by Daniel-Constantin Mierla 09 Sep '20

09 Sep '20

Module: kamailio Branch: master Commit: 761eb0616fea2a859a2c0abb652b22feb6f59859 URL: https://github.com/kamailio/kamailio/commit/761eb0616fea2a859a2c0abb652b22f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-09T17:57:10+02:00 kex: use mutex to sync the mod mem stats rpc commands - related to GH #2433 --- Modified: src/modules/kex/mod_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/761eb0616fea2a859a2c0abb652b22f… Patch: https://github.com/kamailio/kamailio/commit/761eb0616fea2a859a2c0abb652b22f… --- diff --git a/src/modules/kex/mod_stats.c b/src/modules/kex/mod_stats.c index a19a3ed3c3..25e3285c78 100644 --- a/src/modules/kex/mod_stats.c +++ b/src/modules/kex/mod_stats.c @@ -35,7 +35,9 @@ #include "../../core/pt.h" #include "../../core/sr_module.h" #include "../../core/events.h" -#include "../../core/mem/f_malloc.h" +#include "../../core/mem/pkg.h" +#include "../../core/mem/shm.h" +#include "../../core/locking.h" #include "../../core/rpc.h" #include "../../core/rpc_lookup.h" @@ -47,6 +49,9 @@ #define DBG_MOD_ALL_FLAG 3 /* 1|2 - print pkg+shm (1+2) memory stats */ #define DBG_MOD_INF_FLAG 4 /* 1<<2 - print more info in the stats */ + +static gen_lock_t *kex_rpc_mod_mem_stats_lock = NULL; + /** * */ @@ -248,7 +253,9 @@ static void rpc_mod_mem_stats_mode(rpc_t *rpc, void *ctx, int fmode) */ static void rpc_mod_mem_stats(rpc_t *rpc, void *ctx) { - rpc_mod_mem_stats_mode(rpc, ctx, 0); + lock_get(kex_rpc_mod_mem_stats_lock); + rpc_mod_mem_stats_mode(rpc, ctx, 0); + lock_release(kex_rpc_mod_mem_stats_lock); } /** @@ -256,7 +263,9 @@ static void rpc_mod_mem_stats(rpc_t *rpc, void *ctx) */ static void rpc_mod_mem_statsx(rpc_t *rpc, void *ctx) { - rpc_mod_mem_stats_mode(rpc, ctx, DBG_MOD_INF_FLAG); + lock_get(kex_rpc_mod_mem_stats_lock); + rpc_mod_mem_stats_mode(rpc, ctx, DBG_MOD_INF_FLAG); + lock_release(kex_rpc_mod_mem_stats_lock); } @@ -275,6 +284,15 @@ rpc_export_t kex_mod_rpc[] = { */ int mod_stats_init_rpc(void) { + kex_rpc_mod_mem_stats_lock = lock_alloc(); + if(kex_rpc_mod_mem_stats_lock == NULL) { + LM_ERR("failed to allocate the lock\n"); + return -1; + } + if(lock_init(kex_rpc_mod_mem_stats_lock) == NULL) { + LM_ERR("failed to init the lock\n"); + return -1; + } if (rpc_register_array(kex_mod_rpc)!=0) { LM_ERR("failed to register RPC commands\n");

1 0

git:5.2:916110d5: core: skip abort() in free_lump() for LUMPFLAG_DUPED
by Henning Westerholt 09 Sep '20

09 Sep '20

Module: kamailio Branch: 5.2 Commit: 916110d55a1ec83e142bd5fc2e9df8f9a5505eca URL: https://github.com/kamailio/kamailio/commit/916110d55a1ec83e142bd5fc2e9df8f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-09-09T14:43:01Z core: skip abort() in free_lump() for LUMPFLAG_DUPED - the LUMPFLAG_DUPED is set when duplicating lumps list for branch route execution, but some functions such as set_body() may want to clean them - report and minimal reproducing config by Henning Westerholt (cherry picked from commit 57ee97f52dd90c86743b6fd6dd682285ef994e80) --- Modified: src/core/data_lump.c --- Diff: https://github.com/kamailio/kamailio/commit/916110d55a1ec83e142bd5fc2e9df8f… Patch: https://github.com/kamailio/kamailio/commit/916110d55a1ec83e142bd5fc2e9df8f… --- diff --git a/src/core/data_lump.c b/src/core/data_lump.c index 6417bee21a..83d04eca8a 100644 --- a/src/core/data_lump.c +++ b/src/core/data_lump.c @@ -452,14 +452,17 @@ struct lump* anchor_lump2(struct sip_msg* msg, int offset, int len, } +/** + * free lump content + */ void free_lump(struct lump* lmp) { - if (lmp && (lmp->op==LUMP_ADD)){ - if (lmp->u.value){ - if (lmp->flags &(LUMPFLAG_DUPED|LUMPFLAG_SHMEM)){ + if (lmp && (lmp->op==LUMP_ADD)) { + if (lmp->u.value) { + if (lmp->flags & LUMPFLAG_SHMEM) { LM_CRIT("non free-able lump: %p flags=%x\n", lmp, lmp->flags); abort(); - }else{ + } else if(!(lmp->flags & LUMPFLAG_DUPED)) { pkg_free(lmp->u.value); lmp->u.value=0; lmp->len=0;

1 0

git:5.4:2ca2232b: core: skip abort() in free_lump() for LUMPFLAG_DUPED
by Henning Westerholt 09 Sep '20

09 Sep '20

Module: kamailio Branch: 5.4 Commit: 2ca2232b3cac72f7c03b37ef9db5a198462e6dfa URL: https://github.com/kamailio/kamailio/commit/2ca2232b3cac72f7c03b37ef9db5a19… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-09-09T14:42:40Z core: skip abort() in free_lump() for LUMPFLAG_DUPED - the LUMPFLAG_DUPED is set when duplicating lumps list for branch route execution, but some functions such as set_body() may want to clean them - report and minimal reproducing config by Henning Westerholt (cherry picked from commit 57ee97f52dd90c86743b6fd6dd682285ef994e80) --- Modified: src/core/data_lump.c --- Diff: https://github.com/kamailio/kamailio/commit/2ca2232b3cac72f7c03b37ef9db5a19… Patch: https://github.com/kamailio/kamailio/commit/2ca2232b3cac72f7c03b37ef9db5a19… --- diff --git a/src/core/data_lump.c b/src/core/data_lump.c index 765dd5f988..a9a4880199 100644 --- a/src/core/data_lump.c +++ b/src/core/data_lump.c @@ -456,14 +456,17 @@ struct lump* anchor_lump2(struct sip_msg* msg, int offset, int len, } +/** + * free lump content + */ void free_lump(struct lump* lmp) { - if (lmp && (lmp->op==LUMP_ADD)){ - if (lmp->u.value){ - if (lmp->flags &(LUMPFLAG_DUPED|LUMPFLAG_SHMEM)){ + if (lmp && (lmp->op==LUMP_ADD)) { + if (lmp->u.value) { + if (lmp->flags & LUMPFLAG_SHMEM) { LM_CRIT("non free-able lump: %p flags=%x\n", lmp, lmp->flags); abort(); - }else{ + } else if(!(lmp->flags & LUMPFLAG_DUPED)) { pkg_free(lmp->u.value); lmp->u.value=0; lmp->len=0;

1 0

git:5.3:b7efdb12: core: skip abort() in free_lump() for LUMPFLAG_DUPED
by Henning Westerholt 09 Sep '20

09 Sep '20

Module: kamailio Branch: 5.3 Commit: b7efdb12dd2e98c03c38565556169b553b8b6a0a URL: https://github.com/kamailio/kamailio/commit/b7efdb12dd2e98c03c38565556169b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-09-09T14:42:25Z core: skip abort() in free_lump() for LUMPFLAG_DUPED - the LUMPFLAG_DUPED is set when duplicating lumps list for branch route execution, but some functions such as set_body() may want to clean them - report and minimal reproducing config by Henning Westerholt (cherry picked from commit 57ee97f52dd90c86743b6fd6dd682285ef994e80) --- Modified: src/core/data_lump.c --- Diff: https://github.com/kamailio/kamailio/commit/b7efdb12dd2e98c03c38565556169b5… Patch: https://github.com/kamailio/kamailio/commit/b7efdb12dd2e98c03c38565556169b5… --- diff --git a/src/core/data_lump.c b/src/core/data_lump.c index 765dd5f988..a9a4880199 100644 --- a/src/core/data_lump.c +++ b/src/core/data_lump.c @@ -456,14 +456,17 @@ struct lump* anchor_lump2(struct sip_msg* msg, int offset, int len, } +/** + * free lump content + */ void free_lump(struct lump* lmp) { - if (lmp && (lmp->op==LUMP_ADD)){ - if (lmp->u.value){ - if (lmp->flags &(LUMPFLAG_DUPED|LUMPFLAG_SHMEM)){ + if (lmp && (lmp->op==LUMP_ADD)) { + if (lmp->u.value) { + if (lmp->flags & LUMPFLAG_SHMEM) { LM_CRIT("non free-able lump: %p flags=%x\n", lmp, lmp->flags); abort(); - }else{ + } else if(!(lmp->flags & LUMPFLAG_DUPED)) { pkg_free(lmp->u.value); lmp->u.value=0; lmp->len=0;

1 0

git:master:57ee97f5: core: skip abort() in free_lump() for LUMPFLAG_DUPED
by Daniel-Constantin Mierla 09 Sep '20

09 Sep '20

Module: kamailio Branch: master Commit: 57ee97f52dd90c86743b6fd6dd682285ef994e80 URL: https://github.com/kamailio/kamailio/commit/57ee97f52dd90c86743b6fd6dd68228… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-09T15:33:18+02:00 core: skip abort() in free_lump() for LUMPFLAG_DUPED - the LUMPFLAG_DUPED is set when duplicating lumps list for branch route execution, but some functions such as set_body() may want to clean them - report and minimal reproducing config by Henning Westerholt --- Modified: src/core/data_lump.c --- Diff: https://github.com/kamailio/kamailio/commit/57ee97f52dd90c86743b6fd6dd68228… Patch: https://github.com/kamailio/kamailio/commit/57ee97f52dd90c86743b6fd6dd68228… --- diff --git a/src/core/data_lump.c b/src/core/data_lump.c index 765dd5f988..a9a4880199 100644 --- a/src/core/data_lump.c +++ b/src/core/data_lump.c @@ -456,14 +456,17 @@ struct lump* anchor_lump2(struct sip_msg* msg, int offset, int len, } +/** + * free lump content + */ void free_lump(struct lump* lmp) { - if (lmp && (lmp->op==LUMP_ADD)){ - if (lmp->u.value){ - if (lmp->flags &(LUMPFLAG_DUPED|LUMPFLAG_SHMEM)){ + if (lmp && (lmp->op==LUMP_ADD)) { + if (lmp->u.value) { + if (lmp->flags & LUMPFLAG_SHMEM) { LM_CRIT("non free-able lump: %p flags=%x\n", lmp, lmp->flags); abort(); - }else{ + } else if(!(lmp->flags & LUMPFLAG_DUPED)) { pkg_free(lmp->u.value); lmp->u.value=0; lmp->len=0;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev