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

Defer call to alarm() until after we fork the child.

Browse Source 
Pass correct pid to terminate_child()
If the command exits due to signal, set alive to false like we do when it
    exits normally.
Add missing check for errpipe[0] != -1 before using it in FD_ISSET
This commit is contained in:
Todd C. Miller
2010-04-29 16:47:27 -04:00
parent 2ee651df79
commit f45b1e82ed
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/script.c
View File

@@ -437,10 +437,6 @@ script_execve(struct command_details *details, char *argv[], char *envp[],
} }
} }
/* Set command timeout if specified. */
if (ISSET(details->flags, CD_SET_TIMEOUT))
alarm(details->timeout);
/* /*
* Child will run the command in the pty, parent will pass data * Child will run the command in the pty, parent will pass data
* to and from pty. * to and from pty.
@@ -474,6 +470,10 @@ script_execve(struct command_details *details, char *argv[], char *envp[],
} }
close(sv[1]); close(sv[1]);
/* Set command timeout if specified. */
if (ISSET(details->flags, CD_SET_TIMEOUT))
alarm(details->timeout);
/* Max fd we will be selecting on. */ /* Max fd we will be selecting on. */
maxfd = sv[0]; maxfd = sv[0];
@@ -724,7 +724,7 @@ deliver_signal(pid_t pid, int signo)
killpg(pid, signo); killpg(pid, signo);
break; break;
case SIGALRM: case SIGALRM:
terminate_child(child, TRUE); terminate_child(pid, TRUE);
break; break;
case SIGUSR1: case SIGUSR1:
/* foreground process, grant it controlling tty. */ /* foreground process, grant it controlling tty. */
@@ -894,11 +894,13 @@ script_child(const char *path, char *argv[], char *envp[], int backchannel, int
if (WIFSTOPPED(status)) { if (WIFSTOPPED(status)) {
sudo_debug(8, "command stopped, signal %d", sudo_debug(8, "command stopped, signal %d",
WSTOPSIG(status)); WSTOPSIG(status));
} else if (WIFSIGNALED(status)) { } else {
if (WIFSIGNALED(status))
sudo_debug(8, "command killed, signal %d", sudo_debug(8, "command killed, signal %d",
WTERMSIG(status)); WTERMSIG(status));
} else { else
sudo_debug(8, "command exited: %d", WEXITSTATUS(status)); sudo_debug(8, "command exited: %d",
WEXITSTATUS(status));
alive = FALSE; alive = FALSE;
} }
/* Send wait status unless we previously sent errno. */ /* Send wait status unless we previously sent errno. */
@@ -926,7 +928,7 @@ script_child(const char *path, char *argv[], char *envp[], int backchannel, int
error(1, "select failed"); error(1, "select failed");
} }
if (FD_ISSET(errpipe[0], fdsr)) { if (errpipe[0] != -1 && FD_ISSET(errpipe[0], fdsr)) {
/* read errno or EOF from command pipe */ /* read errno or EOF from command pipe */
n = read(errpipe[0], &cstat, sizeof(cstat)); n = read(errpipe[0], &cstat, sizeof(cstat));
if (n == -1) { if (n == -1) {