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

If select() return EBADF in the main event loop, one of the ttys

Browse Source 
must have gone away so perform any I/O we can and close the bad
fds.
This commit is contained in:
Todd C. Miller
2012-04-05 12:39:46 -04:00
parent 2c84bd4d08
commit 6f4afc6652
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/exec.c
View File

@@ -337,6 +337,10 @@ sudo_execute(struct command_details *details, struct command_status *cstat)
if (nready == -1) { if (nready == -1) {
if (errno == EINTR) if (errno == EINTR)
continue; continue;
if (errno == EBADF) {
/* One of the ttys must have gone away. */
goto do_tty_io;
}
error(1, _("select failed")); error(1, _("select failed"));
} }
if (FD_ISSET(sv[0], fdsw)) { if (FD_ISSET(sv[0], fdsw)) {
@@ -403,7 +407,7 @@ sudo_execute(struct command_details *details, struct command_status *cstat)
break; break;
} }
} }
do_tty_io:
if (perform_io(fdsr, fdsw, cstat) != 0) { if (perform_io(fdsr, fdsw, cstat) != 0) {
/* I/O error, kill child if still alive and finish. */ /* I/O error, kill child if still alive and finish. */
sudo_debug_printf(SUDO_DEBUG_ERROR, "I/O error, terminating child"); sudo_debug_printf(SUDO_DEBUG_ERROR, "I/O error, terminating child");