mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 15:17:01 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: debug: protect ha_dump_backtrace() against risks of re-entrance

Browse Source 
If a thread is dumping itself (warning, show thread etc) and another one
wants to dump the state of all threads (e.g. panic), it may interrupt the
first one during backtrace() and re-enter it from the signal handler,
possibly triggering a deadlock in the underlying libc. Let's postpone
the debug signal delivery at this point until the call ends in order to
avoid this.
This commit is contained in:
Willy Tarreau 2025-04-04 18:11:23 +02:00
parent 2dfb63313b
commit d20e9cad67
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/debug.c
View File

@ -180,15 +180,29 @@ unsigned int debug_enable_counters = (DEBUG_COUNTERS >= 2);
*/
void ha_dump_backtrace(struct buffer *buf, const char *prefix, int dump)
{
sigset_t new_mask, old_mask;
struct buffer bak;
char pfx2[100];
void *callers[100];
int j, nptrs;
const void *addr;
/* make sure we don't re-enter from debug coming from other threads,
* as some libc's backtrace() are not re-entrant. We'll block these
* sensitive signals while possibly dumping a backtrace.
*/
sigemptyset(&new_mask);
#ifdef WDTSIG
sigaddset(&new_mask, WDTSIG);
#endif
#ifdef DEBUGSIG
sigaddset(&new_mask, DEBUGSIG);
#endif
ha_sigmask(SIG_BLOCK, &new_mask, &old_mask);
nptrs = my_backtrace(callers, sizeof(callers)/sizeof(*callers));
if (!nptrs)
return;
goto leave;
if (snprintf(pfx2, sizeof(pfx2), "%s| ", prefix) > sizeof(pfx2))
pfx2[0] = 0;
@ -266,6 +280,9 @@ void ha_dump_backtrace(struct buffer *buf, const char *prefix, int dump)
/* OK, line dumped */
chunk_appendf(buf, "\n");
}
leave:
/* unblock temporarily blocked signals */
ha_sigmask(SIG_SETMASK, &old_mask, NULL);
}
/* dump a backtrace of current thread's stack to stderr. */