aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>2020-11-19 05:44:41 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>2020-11-19 05:44:41 +0000
commit5d48efff83b6fdae4767f16014f8391a22d31ac9 (patch)
tree60d8122460c85722710bfcf2482be77e9b522b61
parent591f0beed31ce71c93ca28e42698bd18dd51eb16 (diff)
downloadsrc-5d48efff83b6fdae4767f16014f8391a22d31ac9.tar.gz
src-5d48efff83b6fdae4767f16014f8391a22d31ac9.zip
Merge upstream r948: fix race condition in openpam_ttyconv(3).vendor/openpam
Notes
Notes: svn path=/vendor/openpam/dist/; revision=367831
-rw-r--r--CREDITS1
-rw-r--r--lib/libpam/openpam_ttyconv.c12
2 files changed, 7 insertions, 6 deletions
diff --git a/CREDITS b/CREDITS
index b40c9d3b4826..a560f9e12c1f 100644
--- a/CREDITS
+++ b/CREDITS
@@ -18,6 +18,7 @@ ideas:
Ankita Pal <pal.ankita.ankita@gmail.com>
Baptiste Daroussin <bapt@freebsd.org>
Brian Fundakowski Feldman <green@freebsd.org>
+ Brooks Davis <brooks@freebsd.org>
Christos Zoulas <christos@netbsd.org>
Daniel Richard G. <skunk@iskunk.org>
Darren J. Moffat <darren.moffat@sun.com>
diff --git a/lib/libpam/openpam_ttyconv.c b/lib/libpam/openpam_ttyconv.c
index 8066b3b67298..1a50f1c99639 100644
--- a/lib/libpam/openpam_ttyconv.c
+++ b/lib/libpam/openpam_ttyconv.c
@@ -94,12 +94,6 @@ prompt_tty(int ifd, int ofd, const char *message, char *response, int echo)
int pos, ret;
char ch;
- /* write prompt */
- if (write(ofd, message, strlen(message)) < 0) {
- openpam_log(PAM_LOG_ERROR, "write(): %m");
- return (-1);
- }
-
/* turn echo off if requested */
slflag = 0; /* prevent bogus uninitialized variable warning */
if (!echo) {
@@ -115,6 +109,12 @@ prompt_tty(int ifd, int ofd, const char *message, char *response, int echo)
}
}
+ /* write prompt */
+ if (write(ofd, message, strlen(message)) < 0) {
+ openpam_log(PAM_LOG_ERROR, "write(): %m");
+ return (-1);
+ }
+
/* install signal handlers */
caught_signal = 0;
action.sa_handler = &catch_signal;