Skip to content

signal action: fully disable sigaltstack on Apple #18299

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
junr03 merged 2 commits into from
Sep 28, 2021
Merged

signal action: fully disable sigaltstack on Apple #18299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b15d20
signal action: fully disable sigaltstack on Apple
Sep 28, 2021
e649234
fix warning
Sep 28, 2021
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
10 changes: 4 additions & 6 deletions source/common/signal/signal_action.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,11 @@ void SignalAction::installSigHandlers() {
}

void SignalAction::removeSigHandlers() {
#if defined(__APPLE__)
// ss_flags contains SS_DISABLE, but Darwin still checks the size, contrary to the man page
if (previous_altstack_.ss_size < MINSIGSTKSZ) {
previous_altstack_.ss_size = MINSIGSTKSZ;
}
#endif
// sigaltstack and backtrace() are incompatible on Apple platforms
// https://reviews.llvm.org/D28265
#if !defined(__APPLE__)
RELEASE_ASSERT(sigaltstack(&previous_altstack_, nullptr) == 0, "");
#endif

int hidx = 0;
for (const auto& sig : FATAL_SIGS) {
Expand Down
4 changes: 4 additions & 0 deletions source/common/signal/signal_action.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,11 @@ class SignalAction : NonCopyable {
void unmapStackMemory();
char* altstack_{};
std::array<struct sigaction, sizeof(FATAL_SIGS) / sizeof(int)> previous_handlers_;
// sigaltstack and backtrace() are incompatible on Apple platforms
// https://reviews.llvm.org/D28265
#if !defined(__APPLE__)
stack_t previous_altstack_;
#endif
};

} // namespace Envoy