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

Set SIGCHLD handler to SIG_DFL before forking the askpass command

Browse Source 
and restore after.  Otherwise, SIGCHLD will end up in the list of
pending signals and sudo_execute() will not execute the command.
This commit is contained in:
Todd C. Miller
2017-09-06 15:59:37 -06:00
parent fdff345e0f
commit 4b5aeefebc
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/tgetpass.c
View File

@@ -238,10 +238,18 @@ static char *
sudo_askpass(const char *askpass, const char *prompt)
{
static char buf[SUDO_CONV_REPL_MAX + 1], *pass;
struct sigaction sa, savechld;
int pfd[2], status;
pid_t child;
debug_decl(sudo_askpass, SUDO_DEBUG_CONV)
/* Set SIGCHLD handler to default since we call waitpid() below. */
memset(&sa, 0, sizeof(sa));
sigemptyset(&sa.sa_mask);
sa.sa_flags = SA_RESTART;
sa.sa_handler = SIG_DFL;
(void) sigaction(SIGCHLD, &sa, &savechld);
if (pipe(pfd) == -1)
sudo_fatal(U_("unable to create pipe"));
@@ -288,6 +296,9 @@ sudo_askpass(const char *askpass, const char *prompt)
if (pass == NULL)
errno = EINTR; /* make cancel button simulate ^C */
/* Restore saved SIGCHLD handler. */
(void) sigaction(SIGCHLD, &savechld, NULL);
debug_return_str_masked(pass);
}