diff --git a/plugins/sudoers/auth/pam.c b/plugins/sudoers/auth/pam.c
index c13c370191..6b0f9dcc22 100644
--- a/plugins/sudoers/auth/pam.c
+++ b/plugins/sudoers/auth/pam.c
@@ -31,6 +31,7 @@
 #include <unistd.h>
 #include <pwd.h>
 #include <errno.h>
+#include <fcntl.h>
 
 #ifdef HAVE_PAM_PAM_APPL_H
 # include <pam/pam_appl.h>
@@ -101,6 +102,55 @@ static bool noninteractive;
 static pam_handle_t *pamh;
 static struct conv_filter *conv_filter;
 
+/* Whether terminal echo was disabled during authentication (see below). */
+static bool pam_echo_disabled;
+
+/*
+ * Disable terminal echo during PAM authentication.
+ *
+ * After tgetpass() reads the password it restores the terminal to its
+ * original state, which re-enables echo.  If the PAM stack then sleeps
+ * (for example, the fail delay applied by pam_unix(8) after an incorrect
+ * password) any input typed by the user during that time would be echoed
+ * to the terminal in the clear.  Disabling echo once the password has been
+ * read ensures a password typed ahead during the delay is not revealed.
+ */
+static void
+pam_disable_echo(void)
+{
+    int fd;
+    debug_decl(pam_disable_echo, SUDOERS_DEBUG_AUTH);
+
+    fd = open(_PATH_TTY, O_RDWR);
+    if (fd != -1) {
+	if (sudo_term_noecho(fd))
+	    pam_echo_disabled = true;
+	(void) close(fd);
+    }
+    debug_return;
+}
+
+/*
+ * Restore the terminal settings saved by pam_disable_echo(), re-enabling
+ * echo and flushing any input typed while echo was disabled.
+ */
+static void
+pam_restore_echo(void)
+{
+    int fd;
+    debug_decl(pam_restore_echo, SUDOERS_DEBUG_AUTH);
+
+    if (pam_echo_disabled) {
+	fd = open(_PATH_TTY, O_RDWR);
+	if (fd != -1) {
+	    (void) sudo_term_restore(fd, true);
+	    (void) close(fd);
+	}
+	pam_echo_disabled = false;
+    }
+    debug_return;
+}
+
 static void
 conv_filter_init(const struct sudoers_context *ctx)
 {
@@ -353,6 +403,12 @@ sudo_pam_verify(const struct sudoers_context *ctx, struct passwd *pw,
     /* PAM_SILENT prevents the authentication service from generating output. */
     *pam_status = pam_authenticate(pamh, def_pam_silent ? PAM_SILENT : 0);
 
+    /*
+     * Re-enable terminal echo, which may have been disabled by converse()
+     * so that input typed during the PAM fail delay was not echoed.
+     */
+    pam_restore_echo();
+
     /* Restore def_prompt, the passed-in prompt may be freed later. */
     def_prompt = PASSPROMPT;
 
@@ -480,6 +536,12 @@ sudo_pam_cleanup(const struct sudoers_context *ctx, struct passwd *pw,
     int *pam_status = (int *) auth->data;
     debug_decl(sudo_pam_cleanup, SUDOERS_DEBUG_AUTH);
 
+    /*
+     * Make sure terminal echo is restored in case converse() disabled it
+     * (e.g. during pam_chauthtok()) and it was not restored elsewhere.
+     */
+    pam_restore_echo();
+
     /* If successful, we can't close the session until sudo_pam_end_session() */
     if (force || *pam_status != PAM_SUCCESS || auth->end_session == NULL) {
 	*pam_status = pam_end(pamh, *pam_status | PAM_DATA_SILENT);
@@ -789,6 +851,15 @@ converse(int num_msg, PAM_CONST struct pam_message **msg,
 		goto bad;
 	    }
 	    reply[n].resp = pass;	/* auth_getpass() malloc's a copy */
+
+	    /*
+	     * Disable terminal echo so that a password typed ahead while
+	     * the PAM stack sleeps (e.g. the fail delay after a bad
+	     * password) is not echoed in the clear.  Echo is restored
+	     * once pam_authenticate() returns (see sudo_pam_verify()).
+	     */
+	    if (type == SUDO_CONV_PROMPT_ECHO_OFF)
+		pam_disable_echo();
 	    break;
 	case PAM_TEXT_INFO:
 	    if (pm->msg != NULL && !is_filtered(pm->msg))