nshlib/builtin: check background task before restore the signal #2990
Conversation
This file contains 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
fix crash if: CONFIG_SCHED_WAITPID=n CONFIG_SCHED_CHILD_STATUS=y The old signal will be restored only when sigaction is saved to avoid invaild access. Signed-off-by: chao an <[email protected]>
acassis
approved these changes
Feb 7, 2025
| @@ -234,7 +234,13 @@ int nsh_builtin(FAR struct nsh_vtbl_s *vtbl, FAR const char *cmd, | |||
|
|
|||
| /* Restore the old actions */ | |||
|
|
|||
| sigaction(SIGCHLD, &old, NULL); | |||
| # ifndef CONFIG_SCHED_WAITPID | |||
There was a problem hiding this comment.
Please update the above commit to reflect this modification
There was a problem hiding this comment.
This PR only solves the crash issue, it should not appear in the code comments, and the comments above have already indicated the relevant behavior
Donny9
reviewed
Feb 8, 2025
| @@ -234,7 +234,13 @@ int nsh_builtin(FAR struct nsh_vtbl_s *vtbl, FAR const char *cmd, | |||
|
|
|||
| /* Restore the old actions */ | |||
|
|
|||
| sigaction(SIGCHLD, &old, NULL); | |||
| # ifndef CONFIG_SCHED_WAITPID | |||
There was a problem hiding this comment.
don't need "# ifndef CONFIG_SCHED_WAITPID", keep align with line 92
There was a problem hiding this comment.
line 135 already have this check if CONFIG_SCHED_WAITPID is defined
Donny9
approved these changes
Feb 10, 2025
jerpelea
approved these changes
Feb 10, 2025
CV-Bowen
approved these changes
Feb 12, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
nshlib/builtin: check background task before restore the signal
fix crash if:
CONFIG_SCHED_WAITPID=n
CONFIG_SCHED_CHILD_STATUS=y
The old signal will be restored only when sigaction is saved to avoid invaild access.
Signed-off-by: chao an [email protected]
Impact
N/A
Testing
cmake -B build -DBOARD_CONFIG=qemu-armv7a/rpserver_ivshmem -GNinja
cmake --build build -t menuconfig
qemu-system-arm -cpu cortex-a7 -nographic -machine virt,highmem=off -kernel build/nuttx -nographic