mirror of
https://github.com/freebsd/freebsd-src
synced 2024-09-06 09:10:28 +00:00
Fix the getpwuid_r() call in the gssd daemon so 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:
parent
f5efbffe52
commit
d1e9aa46c5
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=250176
|
@ -37,6 +37,7 @@ __FBSDID("$FreeBSD$");
|
|||
#include <ctype.h>
|
||||
#include <dirent.h>
|
||||
#include <err.h>
|
||||
#include <errno.h>
|
||||
#ifndef WITHOUT_KERBEROS
|
||||
#include <krb5.h>
|
||||
#endif
|
||||
|
@ -557,8 +558,11 @@ gssd_pname_to_uid_1_svc(pname_to_uid_args *argp, pname_to_uid_res *result, struc
|
|||
{
|
||||
gss_name_t name = gssd_find_resource(argp->pname);
|
||||
uid_t uid;
|
||||
char buf[128];
|
||||
char buf[1024], *bufp;
|
||||
struct passwd pwd, *pw;
|
||||
size_t buflen;
|
||||
int error;
|
||||
static size_t buflen_hint = 1024;
|
||||
|
||||
memset(result, 0, sizeof(*result));
|
||||
if (name) {
|
||||
|
@ -567,7 +571,24 @@ gssd_pname_to_uid_1_svc(pname_to_uid_args *argp, pname_to_uid_res *result, struc
|
|||
name, argp->mech, &uid);
|
||||
if (result->major_status == GSS_S_COMPLETE) {
|
||||
result->uid = uid;
|
||||
getpwuid_r(uid, &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 = getpwuid_r(uid, &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) {
|
||||
int len = NGRPS;
|
||||
int groups[NGRPS];
|
||||
|
@ -584,6 +605,8 @@ gssd_pname_to_uid_1_svc(pname_to_uid_args *argp, pname_to_uid_res *result, struc
|
|||
result->gidlist.gidlist_len = 0;
|
||||
result->gidlist.gidlist_val = NULL;
|
||||
}
|
||||
if (bufp != NULL && buflen > sizeof(buf))
|
||||
free(bufp);
|
||||
}
|
||||
} else {
|
||||
result->major_status = GSS_S_BAD_NAME;
|
||||
|
|
Loading…
Reference in a new issue