isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make SIGCHLD handler more consistent with the pty version.

Browse Source 
No real change other than a few debug statements.
This commit is contained in:
Todd C. Miller
2022-05-03 09:38:28 -06:00
parent 4d75b32799
commit 4cac34b86d
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/exec_nopty.c
View File

@@ -542,7 +542,6 @@ handle_sigchld_nopty(struct exec_closure_nopty *ec)
/* There may be multiple children in intercept mode. */ /* There may be multiple children in intercept mode. */
for (;;) { for (;;) {
/* Read command status. */
do { do {
pid = waitpid(-1, &status, wflags); pid = waitpid(-1, &status, wflags);
} while (pid == -1 && errno == EINTR); } while (pid == -1 && errno == EINTR);
@@ -566,7 +565,7 @@ handle_sigchld_nopty(struct exec_closure_nopty *ec)
if (sig2str(signo, signame) == -1) if (sig2str(signo, signame) == -1)
(void)snprintf(signame, sizeof(signame), "%d", signo); (void)snprintf(signame, sizeof(signame), "%d", signo);
sudo_debug_printf(SUDO_DEBUG_INFO, sudo_debug_printf(SUDO_DEBUG_INFO,
"%s: command (%d) stopped, SIG%s", __func__, (int)pid, signame); "%s: process %d stopped, SIG%s", __func__, (int)pid, signame);
if (ISSET(ec->details->flags, CD_USE_PTRACE)) { if (ISSET(ec->details->flags, CD_USE_PTRACE)) {
/* Did exec_ptrace_handled() suppress the signal? */ /* Did exec_ptrace_handled() suppress the signal? */
@@ -574,8 +573,8 @@ handle_sigchld_nopty(struct exec_closure_nopty *ec)
continue; continue;
} }
/* Only report status for the main command. */ /* Special handling for job control in the main command only. */
if (ec->cmnd_pid != pid) if (pid != ec->cmnd_pid)
continue; continue;
/* /*
@@ -654,11 +653,11 @@ handle_sigchld_nopty(struct exec_closure_nopty *ec)
WTERMSIG(status)); WTERMSIG(status));
} }
sudo_debug_printf(SUDO_DEBUG_INFO, sudo_debug_printf(SUDO_DEBUG_INFO,
"%s: command (%d) killed, SIG%s", __func__, "%s: process %d killed, SIG%s", __func__,
(int)pid, signame); (int)pid, signame);
} else if (WIFEXITED(status)) { } else if (WIFEXITED(status)) {
sudo_debug_printf(SUDO_DEBUG_INFO, sudo_debug_printf(SUDO_DEBUG_INFO,
"%s: command (%d) exited: %d", __func__, "%s: process %d exited: %d", __func__,
(int)pid, WEXITSTATUS(status)); (int)pid, WEXITSTATUS(status));
} else { } else {
sudo_debug_printf(SUDO_DEBUG_WARN, sudo_debug_printf(SUDO_DEBUG_WARN,
@@ -666,8 +665,8 @@ handle_sigchld_nopty(struct exec_closure_nopty *ec)
__func__, status, (int)pid); __func__, status, (int)pid);
} }
/* Only report status for the main command. */ /* Only store exit status of the main command. */
if (ec->cmnd_pid != pid) if (pid != ec->cmnd_pid)
continue; continue;
/* Don't overwrite execve() failure with command exit status. */ /* Don't overwrite execve() failure with command exit status. */