Skip to content

[sanitizer_common] Block asynchronous signals only #98200

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
Jul 10, 2024
Merged

[sanitizer_common] Block asynchronous signals only #98200

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a744ae
[sanitizer_common] Add option to block only asynchronous signals
thurstond Jul 9, 2024
da136f9
Unconditionally block asynchronous signals only
thurstond Jul 10, 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
18 changes: 15 additions & 3 deletions compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,9 @@ void SetSigProcMask(__sanitizer_sigset_t *set, __sanitizer_sigset_t *oldset) {
CHECK_EQ(0, internal_sigprocmask(SIG_SETMASK, set, oldset));
}

void BlockSignals(__sanitizer_sigset_t *oldset) {
// If block_async_only is true: blocks only asynchronous signals; otherwise,
// blocks (nearly) all signals.
void BlockSignals(__sanitizer_sigset_t *oldset, bool block_async_only) {
__sanitizer_sigset_t set;
internal_sigfillset(&set);
# if SANITIZER_LINUX && !SANITIZER_ANDROID
Expand All @@ -170,11 +172,21 @@ void BlockSignals(__sanitizer_sigset_t *oldset) {
// hang.
internal_sigdelset(&set, 31);
# endif
if (block_async_only) {
internal_sigdelset(&set, SIGSEGV);
internal_sigdelset(&set, SIGBUS);
internal_sigdelset(&set, SIGILL);
internal_sigdelset(&set, SIGTRAP);
internal_sigdelset(&set, SIGABRT);
internal_sigdelset(&set, SIGFPE);
internal_sigdelset(&set, SIGPIPE);
}
SetSigProcMask(&set, oldset);
}

ScopedBlockSignals::ScopedBlockSignals(__sanitizer_sigset_t *copy) {
BlockSignals(&saved_);
ScopedBlockSignals::ScopedBlockSignals(__sanitizer_sigset_t *copy,
bool block_async_only) {
BlockSignals(&saved_, block_async_only);
if (copy)
internal_memcpy(copy, &saved_, sizeof(saved_));
}
Expand Down
6 changes: 4 additions & 2 deletions compiler-rt/lib/sanitizer_common/sanitizer_linux.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,11 @@ uptr internal_sigprocmask(int how, __sanitizer_sigset_t *set,
__sanitizer_sigset_t *oldset);

void SetSigProcMask(__sanitizer_sigset_t *set, __sanitizer_sigset_t *oldset);
void BlockSignals(__sanitizer_sigset_t *oldset = nullptr);
void BlockSignals(__sanitizer_sigset_t *oldset = nullptr,
bool block_async_only = false);
struct ScopedBlockSignals {
explicit ScopedBlockSignals(__sanitizer_sigset_t *copy);
explicit ScopedBlockSignals(__sanitizer_sigset_t *copy,
bool block_async_only = false);
~ScopedBlockSignals();

ScopedBlockSignals &operator=(const ScopedBlockSignals &) = delete;
Expand Down