Skip to content

fix: Do not overwrite existing signal handlers #5062

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 19, 2024
Merged

fix: Do not overwrite existing signal handlers #5062

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b65607
fix: Do not overwrite existing signal handlers
eric-wieser Aug 15, 2024
51dfd11
Update src/runtime/stack_overflow.cpp
eric-wieser Aug 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions src/runtime/stack_overflow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ Port of the corresponding Rust code (see links below).
#include <cstdlib>
#include <cstring>
#include <lean/lean.h>
#include <initializer_list>
#include "runtime/stack_overflow.h"

namespace lean {
Expand Down Expand Up @@ -45,7 +46,7 @@ stack_guard::stack_guard() {
stack_guard::~stack_guard() {}
#else
// Install a segfault signal handler and abort with custom message if address is within stack guard.
// https://github.com/rust-lang/rust/blob/master/src/libstd/sys/unix/stack_overflow.rs
// https://github.com/rust-lang/rust/blob/master/library/std/src/sys/pal/unix/stack_overflow.rs


// https://github.com/rust-lang/rust/blob/7c8dbd969dd0ef2af6d8bab9e03ba7ce6cac41a2/src/libstd/sys/unix/thread.rs#L293
Expand Down Expand Up @@ -102,12 +103,17 @@ void initialize_stack_overflow() {
#ifdef LEAN_WINDOWS
AddVectoredExceptionHandler(0, stack_overflow_handler);
#else
struct sigaction action;
memset(&action, 0, sizeof(struct sigaction));
action.sa_flags = SA_SIGINFO | SA_ONSTACK;
action.sa_sigaction = segv_handler;
sigaction(SIGSEGV, &action, nullptr);
sigaction(SIGBUS, &action, nullptr);
for (auto signum : {SIGSEGV, SIGBUS}) {
struct sigaction action;
memset(&action, 0, sizeof(struct sigaction));
sigaction(signum, nullptr, &action);
// Configure our signal handler if one is not already set.
if (action.sa_handler == SIG_DFL) {
action.sa_flags = SA_SIGINFO | SA_ONSTACK;
action.sa_sigaction = segv_handler;
sigaction(signum, &action, nullptr);
}
}
#endif
}

Expand Down
Loading