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

Don't try to restore the terminal if we are not the foreground

Browse Source 
process.  Otherwise, we may be stopped by SIGTTOU when we try to
update the terminal settings when cleaning up.
This commit is contained in:
Todd C. Miller
2012-04-05 12:40:51 -04:00
parent 6f4afc6652
commit c0a75ce9d9
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/exec_pty.c
View File

@@ -113,8 +113,11 @@ cleanup(int gotsignal)
{ {
debug_decl(cleanup, SUDO_DEBUG_EXEC); debug_decl(cleanup, SUDO_DEBUG_EXEC);
if (!tq_empty(&io_plugins)) if (!tq_empty(&io_plugins) && io_fds[SFD_USERTTY] != -1) {
term_restore(io_fds[SFD_USERTTY], 0); check_foreground();
if (foreground) {
term_restore(io_fds[SFD_USERTTY], 0);
}
#ifdef HAVE_SELINUX #ifdef HAVE_SELINUX
selinux_restore_tty(); selinux_restore_tty();
#endif #endif
@@ -680,9 +683,12 @@ pty_close(struct command_status *cstat)
flush_output(); flush_output();
if (io_fds[SFD_USERTTY] != -1) { if (io_fds[SFD_USERTTY] != -1) {
do { check_foreground();
n = term_restore(io_fds[SFD_USERTTY], 0); if (foreground) {
} while (!n && errno == EINTR); do {
n = term_restore(io_fds[SFD_USERTTY], 0);
} while (!n && errno == EINTR);
}
} }
/* If child was signalled, write the reason to stdout like the shell. */ /* If child was signalled, write the reason to stdout like the shell. */
@@ -1004,7 +1010,7 @@ exec_monitor(struct command_details *details, int backchannel)
goto done; goto done;
if (errno == EINTR) if (errno == EINTR)
continue; continue;
error(1, _("select failed")); error(1, "monitor: %s", _("select failed"));
} }
if (FD_ISSET(signal_pipe[0], fdsr)) { if (FD_ISSET(signal_pipe[0], fdsr)) {
@@ -1256,7 +1262,7 @@ safe_close(int fd)
/* Avoid closing /dev/tty or std{in,out,err}. */ /* Avoid closing /dev/tty or std{in,out,err}. */
if (fd < 3 || fd == io_fds[SFD_USERTTY]) { if (fd < 3 || fd == io_fds[SFD_USERTTY]) {
errno = EINVAL; errno = EINVAL;
return -1; debug_return_int(-1);
} }
debug_return_int(close(fd)); debug_return_int(close(fd));
} }