mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-31 06:15:37 +00:00
Code Issues Releases Wiki Activity

Block SIGCHLD when forking the mailer.

Browse Source 
Otherwise, it may be picked up by the signal handler instead of our
waitpid(2) call.
Don't warn if waitpid() returns 0 in a SIGCHLD handler.
This commit is contained in:
Todd C. Miller
2022-03-14 13:54:12 -06:00
parent e5a50ae429
commit de47380350
5 changed files with 49 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/exec_pty.c
View File

@@ -1049,12 +1049,14 @@ handle_sigchld_pty(struct exec_closure_pty *ec)
* Monitor process was signaled; wait for it as needed.
*/
do {
pid = waitpid(ec->monitor_pid, &status, WUNTRACED|WNOHANG);
pid = waitpid(ec->monitor_pid, &status, WUNTRACED|WCONTINUED|WNOHANG);
} while (pid == -1 && errno == EINTR);
switch (pid) {
case 0:
errno = ECHILD;
FALLTHROUGH;
/* Nothing to wait for. */
sudo_debug_printf(SUDO_DEBUG_INFO, "%s: no process to wait for",
__func__);
debug_return;
case -1:
sudo_warn(U_("%s: %s"), __func__, "waitpid");
debug_return;
@@ -1065,7 +1067,10 @@ handle_sigchld_pty(struct exec_closure_pty *ec)
* If it was stopped, we should stop too (the command keeps
* running in its pty) and continue it when we come back.
*/
if (WIFSTOPPED(status)) {
if (WIFCONTINUED(status)) {
sudo_debug_printf(SUDO_DEBUG_INFO, "%s: monitor (%d) resumed",
__func__, (int)ec->monitor_pid);
} else if (WIFSTOPPED(status)) {
sudo_debug_printf(SUDO_DEBUG_INFO,
"monitor stopped, suspending sudo");
n = suspend_sudo(ec, WSTOPSIG(status));