Date: Thu, 19 Nov 2020 05:44:41 +0000 (UTC) From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= <des@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r367831 - in vendor/openpam/dist: . lib/libpam Message-ID: <202011190544.0AJ5ifFi080011@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: des Date: Thu Nov 19 05:44:41 2020 New Revision: 367831 URL: https://svnweb.freebsd.org/changeset/base/367831 Log: Merge upstream r948: fix race condition in openpam_ttyconv(3). Modified: vendor/openpam/dist/CREDITS vendor/openpam/dist/lib/libpam/openpam_ttyconv.c Modified: vendor/openpam/dist/CREDITS ============================================================================== --- vendor/openpam/dist/CREDITS Thu Nov 19 04:28:39 2020 (r367830) +++ vendor/openpam/dist/CREDITS Thu Nov 19 05:44:41 2020 (r367831) @@ -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> Modified: vendor/openpam/dist/lib/libpam/openpam_ttyconv.c ============================================================================== --- vendor/openpam/dist/lib/libpam/openpam_ttyconv.c Thu Nov 19 04:28:39 2020 (r367830) +++ vendor/openpam/dist/lib/libpam/openpam_ttyconv.c Thu Nov 19 05:44:41 2020 (r367831) @@ -94,12 +94,6 @@ prompt_tty(int ifd, int ofd, const char *message, char 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) { @@ -113,6 +107,12 @@ prompt_tty(int ifd, int ofd, const char *message, char openpam_log(PAM_LOG_ERROR, "tcsetattr(): %m"); return (-1); } + } + + /* write prompt */ + if (write(ofd, message, strlen(message)) < 0) { + openpam_log(PAM_LOG_ERROR, "write(): %m"); + return (-1); } /* install signal handlers */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202011190544.0AJ5ifFi080011>