sr-dev September 2021

sr-dev@lists.kamailio.org

18 participants
305 discussions

[kamailio/kamailio] tls: fix OpenSSL engine in child processes (#2840)

by aalba6675

tls_init.c calls OPENSSL_init_ssl(); this initializes the global engine linked-list and this cannot be reset in the child. To avoid linked-list corruption we manually instantiate the engine object required for loading private keys instead of relying on CONF_modules_load_file(). Updates to doc/. Addresses #2839   #### 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 - [X] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [X] Related to issue #2839 #### Description The call to `OPENSSL_init_ssl()` in `tls_init.c` results in the creation of the engine linked-list in the parent. This affects per-child engine private keys as there is no api to reinitialize the engine linked-list in the child. This PR removes the call to `CONF_modules_load_file()` which causes linked-list corruption and replaces the initialization of engine private keys in the child with with other api calls which do not manipulate global objects. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2840 -- Commit Summary -- * tls: fix OpenSSL engine in child processes -- File Changes -- M src/modules/tls/doc/hsm_howto.xml (15) M src/modules/tls/tls_mod.c (93) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2840.patch https://github.com/kamailio/kamailio/pull/2840.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/2840

2 years, 8 months

git:master:238ef139: tls: fix OpenSSL engine in child processes

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 238ef139bfbe145fb93e5c4b0730de58040d2265 URL: https://github.com/kamailio/kamailio/commit/238ef139bfbe145fb93e5c4b0730de5… Author: Anthony Alba <ascanio.alba7(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T10:33:13+02:00 tls: fix OpenSSL engine in child processes tls_init.c calls OPENSSL_init_ssl(); this initializes the global engine linked-list and this cannot be reset in the child. To avoid linked-list corruption we manually instantiate the engine object required for loading private keys instead of relying on CONF_modules_load_file(). Updates to doc/. Addresses #2839 --- Modified: src/modules/tls/doc/hsm_howto.xml Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/238ef139bfbe145fb93e5c4b0730de5… Patch: https://github.com/kamailio/kamailio/commit/238ef139bfbe145fb93e5c4b0730de5…

2 years, 8 months

[kamailio/kamailio] tlsf is broken (#2843)

by lazedo

### Description  ### Troubleshooting #### Reproduction kamailio -c -x tlsf -f misc/examples/pkg/kamailio-basic.cfg #### Debugging Data ``` core was generated by `kamailio -c -x tlsf -f misc/examples/pkg/kamailio-basic.cfg'. Program terminated with signal SIGSEGV, Segmentation fault. #0 0x0000555e79902495 in str_hash_add (ht=0x555e79d6e0f0 <main_rt+16>, e=0x7f01c0521a48) at core/str_hash.h:85 85 clist_insert(&ht->table[h], e, next, prev); (gdb) bt full #0 0x0000555e79902495 in str_hash_add (ht=0x555e79d6e0f0 <main_rt+16>, e=0x7f01c0521a48) at core/str_hash.h:85 h = 6 #1 0x0000555e79902e46 in route_add (rt=0x555e79d6e0e0 <main_rt>, name=0x555e79bd87be "0", i=0) at core/route.c:134 e = 0x7f01c0521a48 __func__ = "route_add" #2 0x0000555e799035f3 in init_rlist (r_name=0x555e79bd87c0 "main", rt=0x555e79d6e0e0 <main_rt>, n_entries=2, hash_size=8) at core/route.c:160 __func__ = "init_rlist" #3 0x0000555e79903647 in init_routes () at core/route.c:172 No locals. #4 0x0000555e79776eaa in main (argc=6, argv=0x7ffec006df78) at main.c:2408 cfg_stream = 0x0 c = -1 r = 0 tmp = 0x0 tmp_len = 0 port = 0 proto = 0 ahost = 0x0 aport = 0 options = 0x555e79ba60a8 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 0 rfd = 0 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x0 p = 0x0 st = {st_dev = 0, st_ino = 0, st_nlink = 0, st_mode = 0, st_uid = 0, st_gid = 0, __pad0 = 0, st_rdev = 0, st_size = 0, st_blksize = 0, st_blocks = 0, st_atim = {tv_sec = 0, tv_nsec = 0}, st_mtim = {tv_sec = 0, tv_nsec = 0}, st_ctim = {tv_sec = 0, tv_nsec = 0}, __unused = {0, 0, 0}} tbuf = '\000' <repeats 2336 times>... option_index = 0 long_options = {{name = 0x555e79ba85a6 "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x555e79ba3504 "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x555e79ba85ab "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x555e79ba85b1 "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x555e79ba85b7 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x555e79ba85c0 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x555e79ba85ca "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x555e79ba85d4 "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x555e79ba85df "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x555e79ba85e8 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x555e79ba85f3 "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x555e79ba85f9 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, {name = 0x555e79ba8603 "atexit", has_arg = 1, flag = 0x0, val = 1034}, {name = 0x555e79ba860a "defenv", has_arg = 1, flag = 0x0, val = 1035}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __func__ = "main" (gdb) info locals h = 6 (gdb) list 80 struct str_hash_entry* e) 81 { 82 int h; 83 84 h=get_hash1_raw(e->key.s, e->key.len) % ht->size; 85 clist_insert(&ht->table[h], e, next, prev); 86 } 87 88 89 (gdb) ``` ### Possible Solutions works after reverting - ddafeebfaf1537c684eee22be228867563dd02ac - 2d7aee506c617f2d258719562f8debf2b4ba087e ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` bash-5.0# kamailio -v version: kamailio 5.5.2 (x86_64/linux) 55e232-dirty 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: 55e232 -dirty compiled on 15:08:48 Sep 5 2021 with gcc 9.3.0 ``` * **Operating System**:  ``` Alpine Docker Image 3.12 ``` -- 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/2843

2 years, 8 months

git:5.5:185d8b24: Revert "core/mem: removed tlsf_malloc_bits.h"

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 185d8b24c411a38b5b2c2632abdbf90b3796fbf6 URL: https://github.com/kamailio/kamailio/commit/185d8b24c411a38b5b2c2632abdbf90… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T10:31:26+02:00 Revert "core/mem: removed tlsf_malloc_bits.h" This reverts commit 2d7aee506c617f2d258719562f8debf2b4ba087e. (cherry picked from commit 90f4bd591aba7c6fbe234df1f3868edf4ff0a9f1) --- Added: src/core/mem/tlsf_malloc_bits.h --- Diff: https://github.com/kamailio/kamailio/commit/185d8b24c411a38b5b2c2632abdbf90… Patch: https://github.com/kamailio/kamailio/commit/185d8b24c411a38b5b2c2632abdbf90… --- diff --git a/src/core/mem/tlsf_malloc_bits.h b/src/core/mem/tlsf_malloc_bits.h new file mode 100644 index 0000000000..29c783d4a4 --- /dev/null +++ b/src/core/mem/tlsf_malloc_bits.h @@ -0,0 +1,119 @@ +#ifndef INCLUDED_tlsfbits +#define INCLUDED_tlsfbits + +#if defined(__cplusplus) +#define tlsf_decl inline +#else +#define tlsf_decl static +#endif + +/* +** Architecture-specific bit manipulation routines. +** +** TLSF achieves O(1) cost for malloc and free operations by limiting +** the search for a free block to a free list of guaranteed size +** adequate to fulfill the request, combined with efficient free list +** queries using bitmasks and architecture-specific bit-manipulation +** routines. +** +** Most modern processors provide instructions to count leading zeroes +** in a word, find the lowest and highest set bit, etc. These +** specific implementations will be used when available, falling back +** to a reasonably efficient generic implementation. +** +** NOTE: TLSF spec relies on ffs/fls returning value 0..31. +** ffs/fls return 1-32 by default, returning 0 for error. +*/ + +/* +** Detect whether or not we are building for a 32- or 64-bit (LP/LLP) +** architecture. There is no reliable portable method at compile-time. +*/ +#if defined (__alpha__) || defined (__ia64__) || defined (__x86_64__) \ + || defined (_WIN64) || defined (__LP64__) || defined (__LLP64__) +#define TLSF_64BIT +#endif + +/* +** gcc 3.4 and above have builtin support, specialized for architecture. +** Some compilers masquerade as gcc; patchlevel test filters them out. +** +** Note: clang is compatible with GCC builtins and will also define those macros +*/ +#if defined (__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) \ + && defined (__GNUC_PATCHLEVEL__) + +tlsf_decl int tlsf_ffs(unsigned int word) +{ + return __builtin_ffs(word) - 1; +} + +tlsf_decl int tlsf_fls(unsigned int word) +{ + const int bit = word ? 32 - __builtin_clz(word) : 0; + return bit - 1; +} + +#if defined (TLSF_64BIT) +tlsf_decl int tlsf_fls_sizet(size_t size) +{ + const int bit = size ? 64 - __builtin_clzl(size) : 0; + return bit - 1; +} +#endif +#else +/* Fall back to generic implementation. */ + +tlsf_decl int tlsf_fls_generic(unsigned int word) +{ + int bit = 32; + + if (!word) bit -= 1; + if (!(word & 0xffff0000)) { word <<= 16; bit -= 16; } + if (!(word & 0xff000000)) { word <<= 8; bit -= 8; } + if (!(word & 0xf0000000)) { word <<= 4; bit -= 4; } + if (!(word & 0xc0000000)) { word <<= 2; bit -= 2; } + if (!(word & 0x80000000)) { word <<= 1; bit -= 1; } + + return bit; +} + +/* Implement ffs in terms of fls. */ +tlsf_decl int tlsf_ffs(unsigned int word) +{ + return tlsf_fls_generic(word & (~word + 1)) - 1; +} + +tlsf_decl int tlsf_fls(unsigned int word) +{ + return tlsf_fls_generic(word) - 1; +} + +#if defined (TLSF_64BIT) +tlsf_decl int tlsf_fls_sizet(size_t size) +{ + int high = (int)(size >> 32); + int bits = 0; + if (high) + { + bits = 32 + tlsf_fls(high); + } + else + { + bits = tlsf_fls((int)size & 0xffffffff); + + } + return bits; +} +#endif /* defined (TLSF_64BIT) */ + +#endif /* GNUC */ + + +#if !defined (TLSF_64BIT) +#define tlsf_fls_sizet tlsf_fls +#endif + +#undef tlsf_decl + +#endif

2 years, 8 months

git:5.5:946ec979: Revert "core/mem: tlsf malloc - sync'ed with v3.1"

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 946ec97950e13196926487db817abf2d1655c6b7 URL: https://github.com/kamailio/kamailio/commit/946ec97950e13196926487db817abf2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T10:31:12+02:00 Revert "core/mem: tlsf malloc - sync'ed with v3.1" This reverts commit ddafeebfaf1537c684eee22be228867563dd02ac. (cherry picked from commit 39c53260599405db4626c8a691552f3aabd3448c) --- Modified: src/core/mem/tlsf_malloc.c Modified: src/core/mem/tlsf_malloc.h --- Diff: https://github.com/kamailio/kamailio/commit/946ec97950e13196926487db817abf2… Patch: https://github.com/kamailio/kamailio/commit/946ec97950e13196926487db817abf2…

2 years, 8 months

git:master:90f4bd59: Revert "core/mem: removed tlsf_malloc_bits.h"

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 90f4bd591aba7c6fbe234df1f3868edf4ff0a9f1 URL: https://github.com/kamailio/kamailio/commit/90f4bd591aba7c6fbe234df1f3868ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T10:29:50+02:00 Revert "core/mem: removed tlsf_malloc_bits.h" This reverts commit 2d7aee506c617f2d258719562f8debf2b4ba087e. --- Added: src/core/mem/tlsf_malloc_bits.h --- Diff: https://github.com/kamailio/kamailio/commit/90f4bd591aba7c6fbe234df1f3868ed… Patch: https://github.com/kamailio/kamailio/commit/90f4bd591aba7c6fbe234df1f3868ed… --- diff --git a/src/core/mem/tlsf_malloc_bits.h b/src/core/mem/tlsf_malloc_bits.h new file mode 100644 index 0000000000..29c783d4a4 --- /dev/null +++ b/src/core/mem/tlsf_malloc_bits.h @@ -0,0 +1,119 @@ +#ifndef INCLUDED_tlsfbits +#define INCLUDED_tlsfbits + +#if defined(__cplusplus) +#define tlsf_decl inline +#else +#define tlsf_decl static +#endif + +/* +** Architecture-specific bit manipulation routines. +** +** TLSF achieves O(1) cost for malloc and free operations by limiting +** the search for a free block to a free list of guaranteed size +** adequate to fulfill the request, combined with efficient free list +** queries using bitmasks and architecture-specific bit-manipulation +** routines. +** +** Most modern processors provide instructions to count leading zeroes +** in a word, find the lowest and highest set bit, etc. These +** specific implementations will be used when available, falling back +** to a reasonably efficient generic implementation. +** +** NOTE: TLSF spec relies on ffs/fls returning value 0..31. +** ffs/fls return 1-32 by default, returning 0 for error. +*/ + +/* +** Detect whether or not we are building for a 32- or 64-bit (LP/LLP) +** architecture. There is no reliable portable method at compile-time. +*/ +#if defined (__alpha__) || defined (__ia64__) || defined (__x86_64__) \ + || defined (_WIN64) || defined (__LP64__) || defined (__LLP64__) +#define TLSF_64BIT +#endif + +/* +** gcc 3.4 and above have builtin support, specialized for architecture. +** Some compilers masquerade as gcc; patchlevel test filters them out. +** +** Note: clang is compatible with GCC builtins and will also define those macros +*/ +#if defined (__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) \ + && defined (__GNUC_PATCHLEVEL__) + +tlsf_decl int tlsf_ffs(unsigned int word) +{ + return __builtin_ffs(word) - 1; +} + +tlsf_decl int tlsf_fls(unsigned int word) +{ + const int bit = word ? 32 - __builtin_clz(word) : 0; + return bit - 1; +} + +#if defined (TLSF_64BIT) +tlsf_decl int tlsf_fls_sizet(size_t size) +{ + const int bit = size ? 64 - __builtin_clzl(size) : 0; + return bit - 1; +} +#endif +#else +/* Fall back to generic implementation. */ + +tlsf_decl int tlsf_fls_generic(unsigned int word) +{ + int bit = 32; + + if (!word) bit -= 1; + if (!(word & 0xffff0000)) { word <<= 16; bit -= 16; } + if (!(word & 0xff000000)) { word <<= 8; bit -= 8; } + if (!(word & 0xf0000000)) { word <<= 4; bit -= 4; } + if (!(word & 0xc0000000)) { word <<= 2; bit -= 2; } + if (!(word & 0x80000000)) { word <<= 1; bit -= 1; } + + return bit; +} + +/* Implement ffs in terms of fls. */ +tlsf_decl int tlsf_ffs(unsigned int word) +{ + return tlsf_fls_generic(word & (~word + 1)) - 1; +} + +tlsf_decl int tlsf_fls(unsigned int word) +{ + return tlsf_fls_generic(word) - 1; +} + +#if defined (TLSF_64BIT) +tlsf_decl int tlsf_fls_sizet(size_t size) +{ + int high = (int)(size >> 32); + int bits = 0; + if (high) + { + bits = 32 + tlsf_fls(high); + } + else + { + bits = tlsf_fls((int)size & 0xffffffff); + + } + return bits; +} +#endif /* defined (TLSF_64BIT) */ + +#endif /* GNUC */ + + +#if !defined (TLSF_64BIT) +#define tlsf_fls_sizet tlsf_fls +#endif + +#undef tlsf_decl + +#endif

2 years, 8 months

git:master:39c53260: Revert "core/mem: tlsf malloc - sync'ed with v3.1"

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 39c53260599405db4626c8a691552f3aabd3448c URL: https://github.com/kamailio/kamailio/commit/39c53260599405db4626c8a691552f3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T10:29:29+02:00 Revert "core/mem: tlsf malloc - sync'ed with v3.1" This reverts commit ddafeebfaf1537c684eee22be228867563dd02ac. --- Modified: src/core/mem/tlsf_malloc.c Modified: src/core/mem/tlsf_malloc.h --- Diff: https://github.com/kamailio/kamailio/commit/39c53260599405db4626c8a691552f3… Patch: https://github.com/kamailio/kamailio/commit/39c53260599405db4626c8a691552f3…

2 years, 8 months

git:master:a133a273: core: dprint - include <stdint.h> for uintmax_t

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a133a27336fa12de01319489318fd5e042b49110 URL: https://github.com/kamailio/kamailio/commit/a133a27336fa12de01319489318fd5e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T09:44:10+02:00 core: dprint - include <stdint.h> for uintmax_t --- Modified: src/core/dprint.c --- Diff: https://github.com/kamailio/kamailio/commit/a133a27336fa12de01319489318fd5e… Patch: https://github.com/kamailio/kamailio/commit/a133a27336fa12de01319489318fd5e… --- diff --git a/src/core/dprint.c b/src/core/dprint.c index 9278a701f2..4a6dac31ca 100644 --- a/src/core/dprint.c +++ b/src/core/dprint.c @@ -35,6 +35,7 @@ #include <stdarg.h> #include <stdio.h> #include <strings.h> +#include <stdint.h> #include "globals.h" #include "dprint.h"

2 years, 8 months

git:master:c5e88081: core: cast pthread_self() in log - some distros makes the type opaque

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c5e880814e3a5270583dd8032c7378cde6905813 URL: https://github.com/kamailio/kamailio/commit/c5e880814e3a5270583dd8032c7378c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T09:23:40+02:00 core: cast pthread_self() in log - some distros makes the type opaque --- Modified: src/core/dprint.c --- Diff: https://github.com/kamailio/kamailio/commit/c5e880814e3a5270583dd8032c7378c… Patch: https://github.com/kamailio/kamailio/commit/c5e880814e3a5270583dd8032c7378c… --- diff --git a/src/core/dprint.c b/src/core/dprint.c index 1294037b7a..9278a701f2 100644 --- a/src/core/dprint.c +++ b/src/core/dprint.c @@ -720,7 +720,7 @@ void ksr_slog_json(ksr_logdata_t *kld, const char *format, ...) fprintf(stderr, KSR_SLOG_JSON_CEEFMT, iso8601buf, _tp.tv_nsec, my_pid(), #ifdef HAVE_PTHREAD - pthread_self(), + (uintmax_t)pthread_self(), #endif kld->v_lname, kld->v_mname, kld->v_fname, kld->v_fline, kld->v_func, s_out.s,

2 years, 8 months

git:master:8b128b7d: app_ruby: regenerated api skeleton functions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8b128b7dd544e3e30d615da39e84cec91588249a URL: https://github.com/kamailio/kamailio/commit/8b128b7dd544e3e30d615da39e84cec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T08:25:24+02:00 app_ruby: regenerated api skeleton functions --- Modified: src/modules/app_ruby/app_ruby_kemi_export.c Modified: src/modules/app_ruby/app_ruby_kemi_export.h --- Diff: https://github.com/kamailio/kamailio/commit/8b128b7dd544e3e30d615da39e84cec… Patch: https://github.com/kamailio/kamailio/commit/8b128b7dd544e3e30d615da39e84cec…

2 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2021