timeout: fix signal handling in nested timeouts #9283
+257
−39
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
naoNao89
force-pushed
the
fix-timeout-group-signal-handling
branch
2 times, most recently
from
0d03cef to
5cde083
Compare
Fixes uutils#9127 - cascaded timeouts now properly propagate signals **Root Cause** • Child processes inherit signal dispositions from parent • exec() preserves SIG_IGN, making shell trap handlers fail • Signals like SIGINT/SIGTERM were ignored in nested timeouts **Signal Handling Fixes** • Block signals before spawning child (prevents race conditions) • Reset handlers to SIG_DFL in pre_exec() for: - SIGINT, SIGTERM, SIGHUP, SIGQUIT (shell script signals) - SIGTTIN, SIGTTOU (job control signals) • Install handlers with sigaction() + SA_RESTART (matches GNU) • Unblock signals after handler installation • Send signals from handler using async-signal-safe functions **Exit Code Handling** • SIGALRM (timeout expired) → exit 124 • External signals (SIGTERM, SIGINT) → exit 128 + signal number • Tracks received signal to return correct exit code **Tests Added** • test_cascaded_timeout_signal_propagation (sh + trap handlers) • test_cascaded_timeout_with_bash_trap (bash SIGINT handling) **Other Changes** • Add #[allow(dead_code)] to Terminated enum variant • Update cspell dictionary with signal-related terms
naoNao89
force-pushed
the
fix-timeout-group-signal-handling
branch
from
5cde083 to
e2cd4a0
Compare
|
GNU testsuite comparison: |
Contributor
|
needs update to avoid no space left on CI |
Contributor
Author
|
okee |
naoNao89
force-pushed
the
fix-timeout-group-signal-handling
branch
from
91b5a67 to
e2cd4a0
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #9127
The bug: child processes inherited ignored signal handlers, breaking trap commands in scripts run under cascaded timeouts.
The fix: reset signal handlers to default before exec(), and properly distinguish timeout signals (exit 124) from external signals (exit 128+N).