go/msteinert-go-pam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Security fixes for conversation handler

Browse Source
This commit is contained in:
Michael Steinert
2015-03-31 12:19:55 -05:00
parent 767cadc80c
commit df889e55a6
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
transaction.c
View File

@@ -1,5 +1,6 @@
#include "_cgo_export.h" #include "_cgo_export.h"
#include <security/pam_appl.h> #include <security/pam_appl.h>
#include <string.h>
int cb_pam_conv( int cb_pam_conv(
int num_msg, int num_msg,
@@ -8,13 +9,17 @@ int cb_pam_conv(
void *appdata_ptr) void *appdata_ptr)
{ {
*resp = calloc(num_msg, sizeof **resp); *resp = calloc(num_msg, sizeof **resp);
if (num_msg <= 0 || num_msg > PAM_MAX_NUM_MSG) {
return PAM_CONV_ERR;
}
if (!*resp) { if (!*resp) {
return PAM_BUF_ERR; return PAM_BUF_ERR;
} }
for (size_t i = 0; i < num_msg; ++i) { for (size_t i = 0; i < num_msg; ++i) {
const struct pam_message *m = msg[i]; struct cbPAMConv_return result = cbPAMConv(
struct cbPAMConv_return result = msg[i]->msg_style,
cbPAMConv(m->msg_style, (char *)m->msg, appdata_ptr); (char *)msg[i]->msg,
appdata_ptr);
if (result.r1 != PAM_SUCCESS) { if (result.r1 != PAM_SUCCESS) {
goto error; goto error;
} }
@@ -23,8 +28,12 @@ int cb_pam_conv(
return PAM_SUCCESS; return PAM_SUCCESS;
error: error:
for (size_t i = 0; i < num_msg; ++i) { for (size_t i = 0; i < num_msg; ++i) {
if ((*resp)[i].resp) {
memset((*resp)[i].resp, 0, strlen((*resp)[i].resp));
free((*resp)[i].resp); free((*resp)[i].resp);
} }
}
memset(*resp, 0, num_msg * sizeof *resp);
free(*resp); free(*resp);
*resp = NULL; *resp = NULL;
return PAM_CONV_ERR; return PAM_CONV_ERR;