auth_getpass() returns a dynamically allocated copy of the plaintext

password which needs to be freed after checking (and clearing) it.

diff --git a/plugins/sudoers/auth/aix_auth.c b/plugins/sudoers/auth/aix_auth.c
index 4bc3ae5e2b5bd4fc8f0e2f3df93a768d498efc78..78c4f60863eead6d77dd2aa07834d252dc284d6b 100644 (file)
--- a/plugins/sudoers/auth/aix_auth.c
+++ b/plugins/sudoers/auth/aix_auth.c
@@ -144,6 +144,7 @@ sudo_aix_verify(struct passwd *pw, char *prompt, sudo_auth *auth, struct sudo_co
        message = NULL;
        result = authenticate(pw->pw_name, pass, &reenter, &message);
        memset_s(pass, SUDO_CONV_REPL_MAX, 0, strlen(pass));
+       free(pass);
        prompt = message;
     } while (reenter);
 

diff --git a/plugins/sudoers/auth/bsdauth.c b/plugins/sudoers/auth/bsdauth.c
index 438ba2dfba5ec7cb2888ab251ddd70208ad460c5..412f476eb7b6cb09944e62fc00765161c3fb1737 100644 (file)
--- a/plugins/sudoers/auth/bsdauth.c
+++ b/plugins/sudoers/auth/bsdauth.c
@@ -141,6 +141,7 @@ bsdauth_verify(struct passwd *pw, char *prompt, sudo_auth *auth, struct sudo_con
                log_warningx(0, N_("unable to allocate memory"));
                debug_return_int(AUTH_FATAL);
            }
+           free(pass);
            pass = auth_getpass(s, def_passwd_timeout * 60,
                SUDO_CONV_PROMPT_ECHO_ON, callback);
            free(s);
@@ -150,6 +151,7 @@ bsdauth_verify(struct passwd *pw, char *prompt, sudo_auth *auth, struct sudo_con
     if (pass) {
        authok = auth_userresponse(as, pass, 1);
        memset_s(pass, SUDO_CONV_REPL_MAX, 0, strlen(pass));
+       free(pass);
     }
 
     /* restore old signal handler */

diff --git a/plugins/sudoers/auth/fwtk.c b/plugins/sudoers/auth/fwtk.c
index e144d3cdfff83423baeabc46b911cf8771de2971..eddd51a35b0278812a366d920d1ac55c1e1c052d 100644 (file)
--- a/plugins/sudoers/auth/fwtk.c
+++ b/plugins/sudoers/auth/fwtk.c
@@ -93,6 +93,7 @@ restart:
        (void) snprintf(buf, sizeof(buf), "%s\nResponse: ", &resp[10]);
        pass = auth_getpass(buf, def_passwd_timeout * 60, SUDO_CONV_PROMPT_ECHO_OFF, callback);
        if (pass && *pass == '\0') {
+           free(pass);
            pass = auth_getpass("Response [echo on]: ",
                def_passwd_timeout * 60, SUDO_CONV_PROMPT_ECHO_ON, callback);
        }
@@ -132,8 +133,9 @@ restart:
        sudo_warnx("%s", resp);
     error = AUTH_FAILURE;
 done:
-    memset_s(pass, SUDO_PASS_MAX, 0, strlen(pass));
     memset_s(buf, sizeof(buf), 0, sizeof(buf));
+    memset_s(pass, SUDO_PASS_MAX, 0, strlen(pass));
+    free(pass);
     debug_return_int(error);
 }
 

diff --git a/plugins/sudoers/auth/pam.c b/plugins/sudoers/auth/pam.c
index afb05392ad1a99c41572f0befdff4378ea22c261..8543c7f0bede456c34915fd8d9142e9cb82b266f 100644 (file)
--- a/plugins/sudoers/auth/pam.c
+++ b/plugins/sudoers/auth/pam.c
@@ -443,14 +443,10 @@ converse(int num_msg, PAM_CONST struct pam_message **msg,
                    sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO,
                        "password longer than %d", PAM_MAX_RESP_SIZE);
                    ret = PAM_CONV_ERR;
+                   memset_s(pass, SUDO_CONV_REPL_MAX, 0, strlen(pass));
                    goto done;
                }
-               if ((pr->resp = strdup(pass)) == NULL) {
-                   sudo_warnx(U_("%s: %s"), __func__, U_("unable to allocate memory"));
-                   ret = PAM_BUF_ERR;
-                   goto done;
-               }
-               memset_s(pass, SUDO_CONV_REPL_MAX, 0, strlen(pass));
+               pr->resp = pass;        /* auth_getpass() malloc's a copy */
                break;
            case PAM_TEXT_INFO:
                if (pm->msg)

diff --git a/plugins/sudoers/auth/securid5.c b/plugins/sudoers/auth/securid5.c
index 41eec085f198ef57151127f1547f662bd19d1eec..a822addc1ac15de5e9b537ddec43064f4c989150 100644 (file)
--- a/plugins/sudoers/auth/securid5.c
+++ b/plugins/sudoers/auth/securid5.c
@@ -177,6 +177,10 @@ sudo_securid_verify(struct passwd *pw, char *pass, sudo_auth *auth, struct sudo_
                 /* Sometimes (when current token close to expire?)
                    ACE challenges for the next token displayed
                    (entered without the PIN) */
+               if (pass != NULL) {
+                   memset_s(pass, SUDO_PASS_MAX, 0, strlen(pass));
+                   free(pass);
+               }
                pass = auth_getpass("\
 !!! ATTENTION !!!\n\
 Wait for the token code to change, \n\
@@ -212,6 +216,11 @@ then enter the new token code.\n", \
     /* Free resources */
     SD_Close(*sd);
 
+    if (pass != NULL) {
+       memset_s(pass, SUDO_PASS_MAX, 0, strlen(pass));
+       free(pass);
+    }
+
     /* Return stored state to calling process */
     debug_return_int(rval);
 }

diff --git a/plugins/sudoers/auth/sia.c b/plugins/sudoers/auth/sia.c
index 7856f22d506c498556b6cd5ef8d7ff1605742503..8fbd4913228cb172b052cec1b156860e08d4cc0d 100644 (file)
--- a/plugins/sudoers/auth/sia.c
+++ b/plugins/sudoers/auth/sia.c
@@ -92,6 +92,7 @@ sudo_sia_verify(struct passwd *pw, char *prompt, sudo_auth *auth,
     /* Check password and zero out plaintext copy. */
     rc = sia_ses_authent(NULL, pass, siah);
     memset_s(pass, SUDO_CONV_REPL_MAX, 0, strlen(pass));
+    free(pass);
 
     if (rc == SIASUCCESS)
        debug_return_int(AUTH_SUCCESS);

diff --git a/plugins/sudoers/auth/sudo_auth.c b/plugins/sudoers/auth/sudo_auth.c
index e03af6fdccd919936912e07d27f3ad4e7c90e420..ff5059717d83e3e765745ebab8917b377ac794e4 100644 (file)
--- a/plugins/sudoers/auth/sudo_auth.c
+++ b/plugins/sudoers/auth/sudo_auth.c
@@ -296,8 +296,10 @@ verify_user(struct passwd *pw, char *prompt, int validated,
            if (success != AUTH_FAILURE)
                break;
        }
-       if (!standalone)
+       if (!standalone) {
            memset_s(p, SUDO_CONV_REPL_MAX, 0, strlen(p));
+           free(p);
+       }
 
        if (success != AUTH_FAILURE)
            goto done;
@@ -387,6 +389,11 @@ sudo_auth_end_session(struct passwd *pw)
     debug_return_int(status == AUTH_FATAL ? -1 : 1);
 }
 
+/*
+ * Prompts the user for a password using the conversation function.
+ * Returns the plaintext password or NULL.
+ * The user is responsible for freeing the returned value.
+ */
 char *
 auth_getpass(const char *prompt, int timeout, int type,
     struct sudo_conv_callback *callback)