ClearML/dropbear
1
0
Fork 0
mirror of https://github.com/clearml/dropbear synced 2025-05-14 16:45:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

strdup() variables correctly for the PAM conversation function

Browse Source 
--HG--
branch : private-rez
extra : convert_revision : 706adc0b1c61920dc70b6b203b2033e27bc46c64
This commit is contained in:
Matt Johnston 2004-09-21 11:42:03 +00:00
parent c2af67efd3
commit 5ebfa4aaed
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
svr-authpam.c
View File

@ -84,14 +84,15 @@ pamConvFunc(int num_msg,
break; break;
} }
/* This looks leaky, but the PAM module-writer docs /* You have to read the PAM module-writers' docs (do we look like
* assure us that the caller will free it... */ * module writers? no.) to find out that the module will
* free the pam_response and its resp element - ie we _must_ malloc
* it here */
resp = (struct pam_response*) m_malloc(sizeof(struct pam_response)); resp = (struct pam_response*) m_malloc(sizeof(struct pam_response));
memset(resp, 0, sizeof(struct pam_response)); memset(resp, 0, sizeof(struct pam_response));
/* Safe to just use the direct pointer (no strdup) since resp->resp = m_strdup(userDatap->passwd);
* it shouldn't be getting munged at all */ m_burn(userDatap->passwd, strlen(userDatap->passwd));
resp->resp = userDatap->passwd;
(*respp) = resp; (*respp) = resp;
break; break;
@ -106,14 +107,16 @@ pamConvFunc(int num_msg,
break; break;
} }
/* This looks leaky, but the PAM module-writer docs /* You have to read the PAM module-writers' docs (do we look like
* assure us that the caller will free it... */ * module writers? no.) to find out that the module will
* free the pam_response and its resp element - ie we _must_ malloc
* it here */
resp = (struct pam_response*) m_malloc(sizeof(struct pam_response)); resp = (struct pam_response*) m_malloc(sizeof(struct pam_response));
memset(resp, 0, sizeof(struct pam_response)); memset(resp, 0, sizeof(struct pam_response));
/* Safe to just use the direct pointer (no strdup) since /* Safe to just use the direct pointer (no strdup) since
* it shouldn't be getting munged at all */ * it shouldn't be getting munged at all */
resp->resp = userDatap->user; resp->resp = m_strdup(userDatap->user);
TRACE(("userDatap->user='%s'", userDatap->user)); TRACE(("userDatap->user='%s'", userDatap->user));
(*respp) = resp; (*respp) = resp;
break; break;
@ -139,7 +142,7 @@ pamConvFunc(int num_msg,
* interactive responses, over the network. */ * interactive responses, over the network. */
void svr_auth_pam() { void svr_auth_pam() {
struct UserDataS userData; struct UserDataS userData = {NULL, NULL};
struct pam_conv pamConv = { struct pam_conv pamConv = {
pamConvFunc, pamConvFunc,
&userData /* submitted to pamvConvFunc as appdata_ptr */ &userData /* submitted to pamvConvFunc as appdata_ptr */
@ -163,7 +166,9 @@ void svr_auth_pam() {
password = buf_getstring(ses.payload, &passwordlen); password = buf_getstring(ses.payload, &passwordlen);
/* used to pass data to the PAM conversation function */ /* used to pass data to the PAM conversation function - don't bother with
* strdup() etc since these are touched only by our own conversation
* function (above) which takes care of it */
userData.user = ses.authstate.printableuser; userData.user = ses.authstate.printableuser;
userData.passwd = password; userData.passwd = password;
@ -189,7 +194,7 @@ void svr_auth_pam() {
dropbear_log(LOG_WARNING, "pam_authenticate() failed, rc=%d, %s\n", dropbear_log(LOG_WARNING, "pam_authenticate() failed, rc=%d, %s\n",
rc, pam_strerror(pamHandlep, rc)); rc, pam_strerror(pamHandlep, rc));
dropbear_log(LOG_WARNING, dropbear_log(LOG_WARNING,
"bad pam password attempt for '%s'", "bad PAM password attempt for '%s'",
ses.authstate.printableuser); ses.authstate.printableuser);
send_msg_userauth_failure(0, 1); send_msg_userauth_failure(0, 1);
goto cleanup; goto cleanup;
@ -199,14 +204,14 @@ void svr_auth_pam() {
dropbear_log(LOG_WARNING, "pam_acct_mgmt() failed, rc=%d, %s\n", dropbear_log(LOG_WARNING, "pam_acct_mgmt() failed, rc=%d, %s\n",
rc, pam_strerror(pamHandlep, rc)); rc, pam_strerror(pamHandlep, rc));
dropbear_log(LOG_WARNING, dropbear_log(LOG_WARNING,
"bad pam password attempt for '%s'", "bad PAM password attempt for '%s'",
ses.authstate.printableuser); ses.authstate.printableuser);
send_msg_userauth_failure(0, 1); send_msg_userauth_failure(0, 1);
goto cleanup; goto cleanup;
} }
/* successful authentication */ /* successful authentication */
dropbear_log(LOG_NOTICE, "pam password auth succeeded for '%s'", dropbear_log(LOG_NOTICE, "PAM password auth succeeded for '%s'",
ses.authstate.printableuser); ses.authstate.printableuser);
send_msg_userauth_success(); send_msg_userauth_success();
@ -216,6 +221,7 @@ cleanup:
m_free(password); m_free(password);
} }
if (pamHandlep != NULL) { if (pamHandlep != NULL) {
TRACE(("pam_end"));
(void) pam_end(pamHandlep, 0 /* pam_status */); (void) pam_end(pamHandlep, 0 /* pam_status */);
} }
} }