isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

converse: don't set response pointer on error

Browse Source 
Linux pam_conv(3) says not to set the pointer on PAM_CONV_ERR.
This commit is contained in:
Todd C. Miller
2022-02-01 10:57:40 -07:00
parent 3c84aef902
commit 46ca288216
1 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
plugins/sudoers/auth/pam.c
View File

@@ -319,7 +319,7 @@ sudo_pam_verify(struct passwd *pw, char *prompt, sudo_auth *auth, struct sudo_co
} }
if (getpass_error) { if (getpass_error) {
/* error or ^C from tgetpass() */ /* error or ^C from tgetpass() or running non-interactive */
debug_return_int(noninteractive ? AUTH_NONINTERACTIVE : AUTH_INTR); debug_return_int(noninteractive ? AUTH_NONINTERACTIVE : AUTH_INTR);
} }
switch (*pam_status) { switch (*pam_status) {
@@ -673,7 +673,6 @@ converse(int num_msg, PAM_CONST struct pam_message **msg,
const char *prompt; const char *prompt;
char *pass; char *pass;
int n, type; int n, type;
int ret = PAM_SUCCESS;
debug_decl(converse, SUDOERS_DEBUG_AUTH); debug_decl(converse, SUDOERS_DEBUG_AUTH);
if (num_msg <= 0 || num_msg > PAM_MAX_NUM_MSG) { if (num_msg <= 0 || num_msg > PAM_MAX_NUM_MSG) {
@@ -688,7 +687,6 @@ converse(int num_msg, PAM_CONST struct pam_message **msg,
sudo_warnx(U_("%s: %s"), __func__, U_("unable to allocate memory")); sudo_warnx(U_("%s: %s"), __func__, U_("unable to allocate memory"));
debug_return_int(PAM_BUF_ERR); debug_return_int(PAM_BUF_ERR);
} }
*reply_out = reply;
if (vcallback != NULL) if (vcallback != NULL)
callback = *((struct sudo_conv_callback **)vcallback); callback = *((struct sudo_conv_callback **)vcallback);
@@ -704,13 +702,12 @@ converse(int num_msg, PAM_CONST struct pam_message **msg,
case PAM_PROMPT_ECHO_OFF: case PAM_PROMPT_ECHO_OFF:
/* Error out if the last password read was interrupted. */ /* Error out if the last password read was interrupted. */
if (getpass_error) if (getpass_error)
goto done; goto bad;
/* Treat non-interactive mode as a getpass error. */ /* Treat non-interactive mode as a getpass error. */
if (noninteractive) { if (noninteractive) {
getpass_error = true; getpass_error = true;
ret = PAM_CONV_ERR; goto bad;
goto done;
} }
/* Choose either the sudo prompt or the PAM one. */ /* Choose either the sudo prompt or the PAM one. */
@@ -721,15 +718,13 @@ converse(int num_msg, PAM_CONST struct pam_message **msg,
if (pass == NULL) { if (pass == NULL) {
/* Error (or ^C) reading password, don't try again. */ /* Error (or ^C) reading password, don't try again. */
getpass_error = true; getpass_error = true;
ret = PAM_CONV_ERR; goto bad;
goto done;
} }
if (strlen(pass) >= PAM_MAX_RESP_SIZE) { if (strlen(pass) >= PAM_MAX_RESP_SIZE) {
sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO, sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO,
"password longer than %d", PAM_MAX_RESP_SIZE); "password longer than %d", PAM_MAX_RESP_SIZE);
ret = PAM_CONV_ERR;
explicit_bzero(pass, strlen(pass)); explicit_bzero(pass, strlen(pass));
goto done; goto bad;
} }
reply[n].resp = pass; /* auth_getpass() malloc's a copy */ reply[n].resp = pass; /* auth_getpass() malloc's a copy */
break; break;
@@ -746,13 +741,14 @@ converse(int num_msg, PAM_CONST struct pam_message **msg,
default: default:
sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO, sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO,
"unsupported message style: %d", pm->msg_style); "unsupported message style: %d", pm->msg_style);
ret = PAM_CONV_ERR; goto bad;
goto done;
} }
} }
done: *reply_out = reply;
if (ret != PAM_SUCCESS) { debug_return_int(PAM_SUCCESS);
bad:
/* Zero and free allocated memory and return an error. */ /* Zero and free allocated memory and return an error. */
for (n = 0; n < num_msg; n++) { for (n = 0; n < num_msg; n++) {
struct pam_response *pr = &reply[n]; struct pam_response *pr = &reply[n];
@@ -763,9 +759,7 @@ done:
} }
} }
free(reply); free(reply);
*reply_out = NULL; debug_return_int(PAM_CONV_ERR);
}
debug_return_int(ret);
} }
#endif /* HAVE_PAM */ #endif /* HAVE_PAM */