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

Restore old signal handlers before tty settings. That way SIGTTOU

Browse Source 
is at its original value if sudo_term_restore() should fail.
This commit is contained in:
Todd C. Miller
2015-09-09 15:27:09 -06:00
parent 241174ea2d
commit 38b7aea6b7
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/tgetpass.c
View File

@@ -189,20 +189,7 @@ restart:
} }
restore: restore:
/* Restore old tty settings and signals. */ /* Restore old signal handlers. */
if (!ISSET(flags, TGP_ECHO)) {
for (;;) {
/* Restore old tty settings if possible. */
if (sudo_term_restore(input, 1) || errno != EINTR)
break;
/* Received SIGTTOU, suspend the process. */
if (suspend(SIGTTOU, callback) == -1) {
if (input != STDIN_FILENO)
(void) close(input);
debug_return_ptr(NULL);
}
}
}
(void) sigaction(SIGALRM, &savealrm, NULL); (void) sigaction(SIGALRM, &savealrm, NULL);
(void) sigaction(SIGINT, &saveint, NULL); (void) sigaction(SIGINT, &saveint, NULL);
(void) sigaction(SIGHUP, &savehup, NULL); (void) sigaction(SIGHUP, &savehup, NULL);
@@ -212,6 +199,21 @@ restore:
(void) sigaction(SIGTTIN, &savettin, NULL); (void) sigaction(SIGTTIN, &savettin, NULL);
(void) sigaction(SIGTTOU, &savettou, NULL); (void) sigaction(SIGTTOU, &savettou, NULL);
(void) sigaction(SIGPIPE, &savepipe, NULL); (void) sigaction(SIGPIPE, &savepipe, NULL);
/* Restore old tty settings. */
if (!ISSET(flags, TGP_ECHO)) {
for (;;) {
/* Restore old tty settings if possible. */
if (sudo_term_restore(input, 1) || errno != EINTR)
break;
/* Received SIGTTOU, suspend the process. */
signo[SIGTTOU] = 0;
if (suspend(SIGTTOU, callback) == -1) {
pass = NULL;
break;
}
}
}
if (input != STDIN_FILENO) if (input != STDIN_FILENO)
(void) close(input); (void) close(input);