Skip to content

Commit 24dabf8

Browse files
dvyukovdanielleadams
authored andcommitted
src: don't reset embeder signal handlers
The only bad handler value we can inhert from before exec is SIG_IGN (any actual function pointer is reset to SIG_DFL during exec). If that's the case, we want to reset it back to SIG_DFL. However, it's also possible that an embeder (or an LD_PRELOAD-ed library) has set up own signal handler for own purposes (e.g. profiling). If that's the case, keep it intact. Fix #47013 PR-URL: #47188 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent c7dc6e3 commit 24dabf8

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

src/node.cc

+11
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,17 @@ void ResetSignalHandlers() {
458458
if (nr == SIGKILL || nr == SIGSTOP)
459459
continue;
460460
act.sa_handler = (nr == SIGPIPE || nr == SIGXFSZ) ? SIG_IGN : SIG_DFL;
461+
if (act.sa_handler == SIG_DFL) {
462+
// The only bad handler value we can inhert from before exec is SIG_IGN
463+
// (any actual function pointer is reset to SIG_DFL during exec).
464+
// If that's the case, we want to reset it back to SIG_DFL.
465+
// However, it's also possible that an embeder (or an LD_PRELOAD-ed
466+
// library) has set up own signal handler for own purposes
467+
// (e.g. profiling). If that's the case, we want to keep it intact.
468+
struct sigaction old;
469+
CHECK_EQ(0, sigaction(nr, nullptr, &old));
470+
if ((old.sa_flags & SA_SIGINFO) || old.sa_handler != SIG_IGN) continue;
471+
}
461472
CHECK_EQ(0, sigaction(nr, &act, nullptr));
462473
}
463474
#endif // __POSIX__

0 commit comments

Comments
 (0)