d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the getpwnam_r() call in the pname_to_uid() kerberos library function so

Browse Source 
that it handles the ERANGE error return case. Without this fix, authentication
of users for certain system setups could fail unexpectedly.

Reported by:	Elias Martenson (lokedhs@gmail.com)
Tested by:	Elias Martenson (earlier version)
MFC after:	2 weeks
This commit is contained in:
Rick Macklem 2013-05-02 12:52:49 +00:00
parent d1e9aa46c5
commit 4fb6bc364f
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
kerberos5/lib/libgssapi_krb5/pname_to_uid.c
View File

@ -26,6 +26,7 @@
*/
/* $FreeBSD$ */
#include <errno.h>
#include <pwd.h>
#include "krb5/gsskrb5_locl.h"
@ -37,8 +38,12 @@ _gsskrb5_pname_to_uid(OM_uint32 *minor_status, const gss_name_t pname,
krb5_context context;
krb5_const_principal name = (krb5_const_principal) pname;
krb5_error_code kret;
char lname[MAXLOGNAME + 1], buf[128];
char lname[MAXLOGNAME + 1], buf[1024], *bufp;
struct passwd pwd, *pw;
size_t buflen;
int error;
OM_uint32 ret;
static size_t buflen_hint = 1024;
GSSAPI_KRB5_INIT (&context);
@ -49,11 +54,30 @@ _gsskrb5_pname_to_uid(OM_uint32 *minor_status, const gss_name_t pname,
}
*minor_status = 0;
getpwnam_r(lname, &pwd, buf, sizeof(buf), &pw);
buflen = buflen_hint;
for (;;) {
pw = NULL;
bufp = buf;
if (buflen > sizeof(buf))
bufp = malloc(buflen);
if (bufp == NULL)
break;
error = getpwnam_r(lname, &pwd, bufp, buflen, &pw);
if (error != ERANGE)
break;
if (buflen > sizeof(buf))
free(bufp);
buflen += 1024;
if (buflen > buflen_hint)
buflen_hint = buflen;
}
if (pw) {
*uidp = pw->pw_uid;
return (GSS_S_COMPLETE);
ret = GSS_S_COMPLETE;
} else {
return (GSS_S_FAILURE);
ret = GSS_S_FAILURE;
}
if (bufp != NULL && buflen > sizeof(buf))
free(bufp);
return (ret);
}