Date: Fri, 14 Jun 2013 00:30:11 +0000 (UTC) From: Rick Macklem <rmacklem@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r251721 - stable/8/usr.sbin/gssd Message-ID: <201306140030.r5E0UCKN079543@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rmacklem Date: Fri Jun 14 00:30:11 2013 New Revision: 251721 URL: http://svnweb.freebsd.org/changeset/base/251721 Log: MFC: r250176 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. Modified: stable/8/usr.sbin/gssd/gssd.c Directory Properties: stable/8/usr.sbin/gssd/ (props changed) Modified: stable/8/usr.sbin/gssd/gssd.c ============================================================================== --- stable/8/usr.sbin/gssd/gssd.c Fri Jun 14 00:03:43 2013 (r251720) +++ stable/8/usr.sbin/gssd/gssd.c Fri Jun 14 00:30:11 2013 (r251721) @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$"); #include <sys/syslog.h> #include <ctype.h> #include <err.h> +#include <errno.h> #include <pwd.h> #include <stdio.h> #include <stdlib.h> @@ -475,8 +476,11 @@ gssd_pname_to_uid_1_svc(pname_to_uid_arg { 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) { @@ -485,7 +489,24 @@ gssd_pname_to_uid_1_svc(pname_to_uid_arg 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]; @@ -502,6 +523,8 @@ gssd_pname_to_uid_1_svc(pname_to_uid_arg 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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306140030.r5E0UCKN079543>