upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-04-28 17:49:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

BUG/MINOR: wdt/debug: avoid signal re-entrance between debugger and watchdog

Browse source 
As seen in issue #2860, there are some situations where a watchdog could
trigger during the debug signal handler, and where similarly the debug
signal handler may trigger during the wdt handler. This is really bad
because it could trigger some deadlocks inside inner libc code such as
dladdr() or backtrace() since the code will not protect against re-
entrance but only against concurrent accesses.

A first attempt was made using ha_sigmask() but that's not always very
convenient because the second handler is called immediately after
unblocking the signal and before returning, leaving signal cascades in
backtrace. Instead, let's mark which signals to block at registration
time. Here we're blocking wdt/dbg for both signals, and optionally
SIGRTMAX if DEBUG_DEV is used as that one may also be used in this case.

This should be backported at least to 3.1.
This commit is contained in:
Willy Tarreau 2025-04-04 17:20:25 +02:00
parent 0b56839455
commit ebf1757dc2
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/debug.c
View file

@ -2481,6 +2481,13 @@ static int init_debug()
sa.sa_handler = NULL;
sa.sa_sigaction = debug_handler;
sigemptyset(&sa.sa_mask);
#ifdef WDTSIG
sigaddset(&sa.sa_mask, WDTSIG);
#endif
sigaddset(&sa.sa_mask, DEBUGSIG);
#if defined(DEBUG_DEV)
sigaddset(&sa.sa_mask, SIGRTMAX);
#endif
sa.sa_flags = SA_SIGINFO;
sigaction(DEBUGSIG, &sa, NULL);

7
src/wdt.c
View file

@ -263,6 +263,13 @@ int init_wdt()
sa.sa_handler = NULL;
sa.sa_sigaction = wdt_handler;
sigemptyset(&sa.sa_mask);
sigaddset(&sa.sa_mask, WDTSIG);
#ifdef DEBUGSIG
sigaddset(&sa.sa_mask, DEBUGSIG);
#endif
#if defined(DEBUG_DEV)
sigaddset(&sa.sa_mask, SIGRTMAX);
#endif
sa.sa_flags = SA_SIGINFO;
sigaction(WDTSIG, &sa, NULL);
return ERR_NONE;