sr-dev March 2024

sr-dev@lists.kamailio.org

14 participants
242 discussions

git:5.8:dae15377: tls: NULL safety check

by S-P Chan

Module: kamailio Branch: 5.8 Commit: dae15377dac1b019f2278baca208162154d5a7ad URL: https://github.com/kamailio/kamailio/commit/dae15377dac1b019f2278baca208162… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-03-05T10:01:03+08:00 tls: NULL safety check (cherry picked from commit f6f9d90ada963b53b6552e1a172b8f2fd021c33b) --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/dae15377dac1b019f2278baca208162… Patch: https://github.com/kamailio/kamailio/commit/dae15377dac1b019f2278baca208162… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 6dfde00c93a..b4a2afb7818 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -871,6 +871,8 @@ EVP_PKEY *tls_engine_private_key(const char *key_id) while(!(OSSL_STORE_eof(ctx))) { OSSL_STORE_INFO *info = OSSL_STORE_load(ctx); + if(info == NULL) + continue; int type; type = OSSL_STORE_INFO_get_type(info);

9 months, 3 weeks

git:master:f6f9d90a: tls: NULL safety check

by S-P Chan

Module: kamailio Branch: master Commit: f6f9d90ada963b53b6552e1a172b8f2fd021c33b URL: https://github.com/kamailio/kamailio/commit/f6f9d90ada963b53b6552e1a172b8f2… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-03-05T09:59:41+08:00 tls: NULL safety check --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f6f9d90ada963b53b6552e1a172b8f2… Patch: https://github.com/kamailio/kamailio/commit/f6f9d90ada963b53b6552e1a172b8f2… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 6dfde00c93a..b4a2afb7818 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -871,6 +871,8 @@ EVP_PKEY *tls_engine_private_key(const char *key_id) while(!(OSSL_STORE_eof(ctx))) { OSSL_STORE_INFO *info = OSSL_STORE_load(ctx); + if(info == NULL) + continue; int type; type = OSSL_STORE_INFO_get_type(info);

9 months, 3 weeks

git:5.8:56aeb072: etc/kamailio.cfg: document tls_threads_mode = 2 to use atfork handler

by S-P Chan

Module: kamailio Branch: 5.8 Commit: 56aeb0723562409aa97098e51c602bcddc8b6789 URL: https://github.com/kamailio/kamailio/commit/56aeb0723562409aa97098e51c602bc… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-03-05T06:48:35+08:00 etc/kamailio.cfg: document tls_threads_mode = 2 to use atfork handler (cherry picked from commit 5b4926b04ba0fcd8f65f5709789abd83181a381a) --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/56aeb0723562409aa97098e51c602bc… Patch: https://github.com/kamailio/kamailio/commit/56aeb0723562409aa97098e51c602bc… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 2d68f7692e1..3f9a5fe793f 100755 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -224,8 +224,9 @@ tls_max_connections=2048 /* For OpenSSL 3 integration * functions calling libssl3 can be invoked in a transient thread * 0: disable threaded calls - * 1: use threads for process#0 only - * 2: use threads for all processes */ + * 1: use thread executors for process#0 only + * 2: no thread executors, but use atfork handler to reset thread-locals to NULL + * 3: use thread executors for all processes */ tls_threads_mode=1 #!endif

9 months, 3 weeks

git:master:5b4926b0: etc/kamailio.cfg: document tls_threads_mode = 2 to use atfork handler

by S-P Chan

Module: kamailio Branch: master Commit: 5b4926b04ba0fcd8f65f5709789abd83181a381a URL: https://github.com/kamailio/kamailio/commit/5b4926b04ba0fcd8f65f5709789abd8… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-03-05T06:47:24+08:00 etc/kamailio.cfg: document tls_threads_mode = 2 to use atfork handler --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/5b4926b04ba0fcd8f65f5709789abd8… Patch: https://github.com/kamailio/kamailio/commit/5b4926b04ba0fcd8f65f5709789abd8… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 2d68f7692e1..3f9a5fe793f 100755 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -224,8 +224,9 @@ tls_max_connections=2048 /* For OpenSSL 3 integration * functions calling libssl3 can be invoked in a transient thread * 0: disable threaded calls - * 1: use threads for process#0 only - * 2: use threads for all processes */ + * 1: use thread executors for process#0 only + * 2: no thread executors, but use atfork handler to reset thread-locals to NULL + * 3: use thread executors for all processes */ tls_threads_mode=1 #!endif

9 months, 3 weeks

git:master:8a2894cd: core: main - init local variables used for cli param parsing

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8a2894cd6180f904dd37acb4985db4e4935aa434 URL: https://github.com/kamailio/kamailio/commit/8a2894cd6180f904dd37acb4985db4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-04T15:31:47+01:00 core: main - init local variables used for cli param parsing --- Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/8a2894cd6180f904dd37acb4985db4e… Patch: https://github.com/kamailio/kamailio/commit/8a2894cd6180f904dd37acb4985db4e… --- diff --git a/src/main.c b/src/main.c index 1856bf7bc03..c7e98e1b433 100644 --- a/src/main.c +++ b/src/main.c @@ -2083,9 +2083,9 @@ int main(int argc, char **argv) int c, r; char *tmp; int tmp_len; - int port; - int proto; - int aproto; + int port = 5060; + int proto = PROTO_NONE; + int aproto = PROTO_NONE; char *ahost = NULL; int aport = 0; char *options;

9 months, 3 weeks

git:5.8:0ba1ff1d: tls: new option tls_threads_mode = 2

by S-P Chan

Module: kamailio Branch: 5.8 Commit: 0ba1ff1d430e5e51c7745d7eb1242dcae2557db9 URL: https://github.com/kamailio/kamailio/commit/0ba1ff1d430e5e51c7745d7eb1242dc… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-03-04T22:27:36+08:00 tls: new option tls_threads_mode = 2 - use pthread_atfork to force all thread-locals to 0x0 after fork() (cherry picked from commit 464299c202f3ba963aed821b777075397e843856) --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/0ba1ff1d430e5e51c7745d7eb1242dc… Patch: https://github.com/kamailio/kamailio/commit/0ba1ff1d430e5e51c7745d7eb1242dc… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 1dc9357f56a..6dfde00c93a 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -337,6 +337,20 @@ static tls_domains_cfg_t* tls_use_modparams(void) } #endif +/* global config tls_threads_mode = 2 + * - force all thread-locals to be 0x0 after fork() + * - with OpenSSL loaded the largest value observed + * is < 10 + * + */ +static void fork_child(void) +{ + for(int k = 0; k < 16; k++) { + if(pthread_getspecific(k) != 0) + pthread_setspecific(k, 0x0); + } +} + static int mod_init(void) { int method; @@ -446,6 +460,9 @@ static int mod_init(void) ksr_module_set_flag(KSRMOD_FLAG_POSTCHILDINIT); } #endif + if(ksr_tls_threads_mode == 2) { + pthread_atfork(NULL, NULL, &fork_child); + } return 0; error: tls_h_mod_destroy_f();

9 months, 3 weeks

git:5.8:0a565d34: core/rthreads.h: add new option tls_threads_mode = 2

by S-P Chan

Module: kamailio Branch: 5.8 Commit: 0a565d34b98b7ec4de0524a3e216e8d907661181 URL: https://github.com/kamailio/kamailio/commit/0a565d34b98b7ec4de0524a3e216e8d… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-03-04T22:27:15+08:00 core/rthreads.h: add new option tls_threads_mode = 2 - add global handling of thread-locals with tls_threads_mode = 2 - this will run a pthread_atfork handler to reset all thread-locals to 0x0 - alternative solution to running functions in thread executors - requires tls.so to be loaded to be effective (cherry picked from commit e7f040f219b46592081a6053b4ed1ae0d0552b1a) --- Modified: src/core/rthreads.h --- Diff: https://github.com/kamailio/kamailio/commit/0a565d34b98b7ec4de0524a3e216e8d… Patch: https://github.com/kamailio/kamailio/commit/0a565d34b98b7ec4de0524a3e216e8d… --- diff --git a/src/core/rthreads.h b/src/core/rthreads.h index 0f4f0cf8b8a..6fee4d0b407 100644 --- a/src/core/rthreads.h +++ b/src/core/rthreads.h @@ -40,7 +40,7 @@ static void *run_threadP(_thread_proto fn, void *arg) pthread_t tid; void *ret; - if(likely(ksr_tls_threads_mode == 0 + if(likely(ksr_tls_threads_mode == 0 || ksr_tls_threads_mode == 2 || (ksr_tls_threads_mode == 1 && process_no > 0))) { return fn(arg); } @@ -77,7 +77,7 @@ static void *run_threadPI(_thread_protoPI fn, void *arg1, int arg2) pthread_t tid; void *ret; - if(likely(ksr_tls_threads_mode == 0 + if(likely(ksr_tls_threads_mode == 0 || ksr_tls_threads_mode == 2 || (ksr_tls_threads_mode == 1 && process_no > 0))) { return fn(arg1, arg2); } @@ -113,7 +113,7 @@ static void run_threadV(_thread_protoV fn) #ifdef USE_TLS pthread_t tid; - if(likely(ksr_tls_threads_mode == 0 + if(likely(ksr_tls_threads_mode == 0 || ksr_tls_threads_mode == 2 || (ksr_tls_threads_mode == 1 && process_no > 0))) { fn(); return; @@ -152,7 +152,7 @@ static int run_thread4PP(_thread_proto4PP fn, void *arg1, void *arg2) pthread_t tid; int ret; - if(likely(ksr_tls_threads_mode == 0 + if(likely(ksr_tls_threads_mode == 0 || ksr_tls_threads_mode == 2 || (ksr_tls_threads_mode == 1 && process_no > 0))) { return fn(arg1, arg2); } @@ -188,7 +188,7 @@ static void run_thread0P(_thread_proto0P fn, void *arg1) #ifdef USE_TLS pthread_t tid; - if(likely(ksr_tls_threads_mode == 0 + if(likely(ksr_tls_threads_mode == 0 || ksr_tls_threads_mode == 2 || (ksr_tls_threads_mode == 1 && process_no > 0))) { fn(arg1); return; @@ -240,7 +240,7 @@ static int run_thread4P5I2P2(_thread_proto4P5I2P2 fn, void *arg1, void *arg2, pthread_t tid; int ret; - if(likely(ksr_tls_threads_mode == 0 + if(likely(ksr_tls_threads_mode == 0 || ksr_tls_threads_mode == 2 || (ksr_tls_threads_mode == 1 && process_no > 0))) { return fn(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9); } @@ -278,7 +278,7 @@ static int run_thread4L(_thread_proto4L fn, long arg1) pthread_t tid; int ret; - if(likely(ksr_tls_threads_mode == 0 + if(likely(ksr_tls_threads_mode == 0 || ksr_tls_threads_mode == 2 || (ksr_tls_threads_mode == 1 && process_no > 0))) { return fn(arg1); }

9 months, 3 weeks

git:master:464299c2: tls: new option tls_threads_mode = 2

by S-P Chan

Module: kamailio Branch: master Commit: 464299c202f3ba963aed821b777075397e843856 URL: https://github.com/kamailio/kamailio/commit/464299c202f3ba963aed821b7770753… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-03-04T22:00:38+08:00 tls: new option tls_threads_mode = 2 - use pthread_atfork to force all thread-locals to 0x0 after fork() --- Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/464299c202f3ba963aed821b7770753… Patch: https://github.com/kamailio/kamailio/commit/464299c202f3ba963aed821b7770753… --- diff --git a/src/modules/tls/tls_mod.c b/src/modules/tls/tls_mod.c index 1dc9357f56a..6dfde00c93a 100644 --- a/src/modules/tls/tls_mod.c +++ b/src/modules/tls/tls_mod.c @@ -337,6 +337,20 @@ static tls_domains_cfg_t* tls_use_modparams(void) } #endif +/* global config tls_threads_mode = 2 + * - force all thread-locals to be 0x0 after fork() + * - with OpenSSL loaded the largest value observed + * is < 10 + * + */ +static void fork_child(void) +{ + for(int k = 0; k < 16; k++) { + if(pthread_getspecific(k) != 0) + pthread_setspecific(k, 0x0); + } +} + static int mod_init(void) { int method; @@ -446,6 +460,9 @@ static int mod_init(void) ksr_module_set_flag(KSRMOD_FLAG_POSTCHILDINIT); } #endif + if(ksr_tls_threads_mode == 2) { + pthread_atfork(NULL, NULL, &fork_child); + } return 0; error: tls_h_mod_destroy_f();

9 months, 3 weeks

git:master:e7f040f2: core/rthreads.h: add new option tls_threads_mode = 2

by S-P Chan

Module: kamailio Branch: master Commit: e7f040f219b46592081a6053b4ed1ae0d0552b1a URL: https://github.com/kamailio/kamailio/commit/e7f040f219b46592081a6053b4ed1ae… Author: S-P Chan <shihping.chan(a)gmail.com> Committer: S-P Chan <shihping.chan(a)gmail.com> Date: 2024-03-04T22:00:38+08:00 core/rthreads.h: add new option tls_threads_mode = 2 - add global handling of thread-locals with tls_threads_mode = 2 - this will run a pthread_atfork handler to reset all thread-locals to 0x0 - alternative solution to running functions in thread executors - requires tls.so to be loaded to be effective --- Modified: src/core/rthreads.h --- Diff: https://github.com/kamailio/kamailio/commit/e7f040f219b46592081a6053b4ed1ae… Patch: https://github.com/kamailio/kamailio/commit/e7f040f219b46592081a6053b4ed1ae… --- diff --git a/src/core/rthreads.h b/src/core/rthreads.h index 1a04f9982c7..56d68cef276 100644 --- a/src/core/rthreads.h +++ b/src/core/rthreads.h @@ -40,7 +40,7 @@ static void *run_threadP(_thread_proto fn, void *arg) pthread_t tid; void *ret = NULL; - if(likely(ksr_tls_threads_mode == 0 + if(likely(ksr_tls_threads_mode == 0 || ksr_tls_threads_mode == 2 || (ksr_tls_threads_mode == 1 && process_no > 0))) { return fn(arg); } @@ -77,7 +77,7 @@ static void *run_threadPI(_thread_protoPI fn, void *arg1, int arg2) pthread_t tid; void *ret = NULL; - if(likely(ksr_tls_threads_mode == 0 + if(likely(ksr_tls_threads_mode == 0 || ksr_tls_threads_mode == 2 || (ksr_tls_threads_mode == 1 && process_no > 0))) { return fn(arg1, arg2); } @@ -113,7 +113,7 @@ static void run_threadV(_thread_protoV fn) #ifdef USE_TLS pthread_t tid; - if(likely(ksr_tls_threads_mode == 0 + if(likely(ksr_tls_threads_mode == 0 || ksr_tls_threads_mode == 2 || (ksr_tls_threads_mode == 1 && process_no > 0))) { fn(); return; @@ -152,7 +152,7 @@ static int run_thread4PP(_thread_proto4PP fn, void *arg1, void *arg2) pthread_t tid; int ret = 0; - if(likely(ksr_tls_threads_mode == 0 + if(likely(ksr_tls_threads_mode == 0 || ksr_tls_threads_mode == 2 || (ksr_tls_threads_mode == 1 && process_no > 0))) { return fn(arg1, arg2); } @@ -188,7 +188,7 @@ static void run_thread0P(_thread_proto0P fn, void *arg1) #ifdef USE_TLS pthread_t tid; - if(likely(ksr_tls_threads_mode == 0 + if(likely(ksr_tls_threads_mode == 0 || ksr_tls_threads_mode == 2 || (ksr_tls_threads_mode == 1 && process_no > 0))) { fn(arg1); return; @@ -240,7 +240,7 @@ static int run_thread4P5I2P2(_thread_proto4P5I2P2 fn, void *arg1, void *arg2, pthread_t tid; int ret = 0; - if(likely(ksr_tls_threads_mode == 0 + if(likely(ksr_tls_threads_mode == 0 || ksr_tls_threads_mode == 2 || (ksr_tls_threads_mode == 1 && process_no > 0))) { return fn(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9); } @@ -278,7 +278,7 @@ static int run_thread4L(_thread_proto4L fn, long arg1) pthread_t tid; int ret = 0; - if(likely(ksr_tls_threads_mode == 0 + if(likely(ksr_tls_threads_mode == 0 || ksr_tls_threads_mode == 2 || (ksr_tls_threads_mode == 1 && process_no > 0))) { return fn(arg1); }

9 months, 3 weeks

git:master:5b8b2717: ctl: reset log prefix on reading ctl traffic

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5b8b2717ee2f57da932132683b27eb33cea3fd59 URL: https://github.com/kamailio/kamailio/commit/5b8b2717ee2f57da932132683b27eb3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2024-03-04T13:58:35+01:00 ctl: reset log prefix on reading ctl traffic - it may be previously set in process by some event route --- Modified: src/modules/ctl/fifo_server.c Modified: src/modules/ctl/io_listener.c --- Diff: https://github.com/kamailio/kamailio/commit/5b8b2717ee2f57da932132683b27eb3… Patch: https://github.com/kamailio/kamailio/commit/5b8b2717ee2f57da932132683b27eb3… --- diff --git a/src/modules/ctl/fifo_server.c b/src/modules/ctl/fifo_server.c index 772441d31e4..94a700cf50e 100644 --- a/src/modules/ctl/fifo_server.c +++ b/src/modules/ctl/fifo_server.c @@ -736,6 +736,7 @@ int fifo_process(char *msg_buf, int size, int *bytes_needed, void *sh, static rpc_ctx_t context; unsigned int rdata; + log_prefix_set(NULL); DBG("process_fifo: called with %d bytes, offset %d: %.*s\n", size, (int)(long)*saved_state, size, msg_buf); /* search for the end of the request (\n\r) */ diff --git a/src/modules/ctl/io_listener.c b/src/modules/ctl/io_listener.c index ed584e4c7f9..3634b63acff 100644 --- a/src/modules/ctl/io_listener.c +++ b/src/modules/ctl/io_listener.c @@ -26,6 +26,7 @@ #include "../../core/mem/mem.h" #include "../../core/rpc.h" /* who & ls rpcs */ #include "../../core/ut.h" +#include "../../core/action.h" #include "../../core/cfg/cfg_struct.h" #include "ctrl_socks.h" @@ -346,6 +347,7 @@ static int handle_ctrl_dgram(struct ctrl_socket *cs) struct send_handle sh; void *saved_state; + log_prefix_set(NULL); saved_state = 0; /* we get always a new datagram */ sh.fd = cs->fd; sh.type = S_DISCONNECTED; @@ -486,6 +488,7 @@ static int handle_stream_read(struct stream_connection *s_c, int idx) sh.from_len = 0; r = &s_c->req; bytes_free = STREAM_BUF_SIZE - (int)(r->end - r->buf); + log_prefix_set(NULL); if(bytes_free == 0) { LOG(L_ERR, "ERROR: handle_stream_read: buffer overrun\n"); goto close_connection;

9 months, 3 weeks

← Newer
1
...
18
19
20
21
22
23
24
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2024