aland/quickshell
1
0
Fork 0
mirror of https://git.outfoxxed.me/quickshell/quickshell.git synced 2026-04-10 06:11:54 +10:00
Code Issues Projects Releases Packages Wiki Activity Actions

crash: unmask signals before reexec

Browse source 
Signals were previously left masked before reexec, causing UB if a
child were to crash again, instead of triggering the reporter.

This might've been responsible for a number of unexplainable bugs.
This commit is contained in:
outfoxxed 2026-03-28 20:14:58 -07:00
parent 08058326f0
commit 308f1e249b
No known key found for this signature in database
GPG key ID: 4C88A185FB89301E
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/crash/handler.cpp
View file

@ -58,6 +58,12 @@ void signalHandler(
siginfo_t* /*info*/, // NOLINT (misc-include-cleaner) siginfo_t* /*info*/, // NOLINT (misc-include-cleaner)
void* /*context*/ void* /*context*/
) { ) {
// NOLINTBEGIN (misc-include-cleaner)
sigset_t set;
sigfillset(&set);
sigprocmask(SIG_UNBLOCK, &set, nullptr);
// NOLINTEND
if (CrashInfo::INSTANCE.traceFd != -1) { if (CrashInfo::INSTANCE.traceFd != -1) {
auto traceBuffer = std::array<cpptrace::frame_ptr, 1024>(); auto traceBuffer = std::array<cpptrace::frame_ptr, 1024>();
auto frameCount = cpptrace::safe_generate_raw_trace(traceBuffer.data(), traceBuffer.size(), 1); auto frameCount = cpptrace::safe_generate_raw_trace(traceBuffer.data(), traceBuffer.size(), 1);
@ -79,13 +85,9 @@ void signalHandler(
fail:; fail:;
} }
// TODO: coredump fork and crash reporter remain as zombies, fix
auto coredumpPid = fork(); auto coredumpPid = fork();
if (coredumpPid == 0) { if (coredumpPid == 0) {
// NOLINTBEGIN (misc-include-cleaner)
sigset_t set;
sigfillset(&set);
sigprocmask(SIG_UNBLOCK, &set, nullptr);
// NOLINTEND
raise(sig); raise(sig);
_exit(-1); _exit(-1);
} }
@ -131,7 +133,6 @@ void signalHandler(
perror("Failed to fork and launch crash reporter.\n"); perror("Failed to fork and launch crash reporter.\n");
_exit(-1); _exit(-1);
} else if (pid == 0) { } else if (pid == 0) {
// dup to remove CLOEXEC // dup to remove CLOEXEC
auto dumpFdStr = std::array<char, 48>(); auto dumpFdStr = std::array<char, 48>();
auto logFdStr = std::array<char, 48>(); auto logFdStr = std::array<char, 48>();