diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2016-10-18 12:47:19 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2016-10-18 12:47:19 +0000 |
| commit | 2a6b957b519827565f883af8d91a43376d8f95c5 (patch) | |
| tree | 6a24fafd82fe846751d87f6619f98ca5f1d1484c | |
| parent | 761cd47a3556c1c75ca575c94eeb9d90a164172b (diff) | |
Avoid generate SIGTTOU when restoring the terminal mode. If we get
SIGTTOU it means the process is not in the foreground process group
which, in most cases, means that the shell has taken control of the
tty. Requiring the user the fg the process in this case doesn't
make sense and can result in both SIGTSTP and SIGTTOU being sent
which can lead to the process being suspended again immediately
after being brought into the foreground.
| -rw-r--r-- | lib/libc/gen/readpassphrase.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/libc/gen/readpassphrase.c b/lib/libc/gen/readpassphrase.c index 3837b0881de..a1aeb342ba7 100644 --- a/lib/libc/gen/readpassphrase.c +++ b/lib/libc/gen/readpassphrase.c @@ -1,4 +1,4 @@ -/* $OpenBSD: readpassphrase.c,v 1.25 2015/09/14 10:45:27 guenther Exp $ */ +/* $OpenBSD: readpassphrase.c,v 1.26 2016/10/18 12:47:18 millert Exp $ */ /* * Copyright (c) 2000-2002, 2007, 2010 @@ -133,9 +133,13 @@ restart: /* Restore old terminal settings and signals. */ if (memcmp(&term, &oterm, sizeof(term)) != 0) { + const int sigttou = signo[SIGTTOU]; + + /* Ignore SIGTTOU generated when we are not the fg pgrp. */ while (tcsetattr(input, TCSAFLUSH|TCSASOFT, &oterm) == -1 && errno == EINTR && !signo[SIGTTOU]) continue; + signo[SIGTTOU] = sigttou; } (void)sigaction(SIGALRM, &savealrm, NULL); (void)sigaction(SIGHUP, &savehup, NULL); |