From patchwork Sun Mar 1 15:18:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 444972 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 1BCC3140172 for ; Mon, 2 Mar 2015 19:43:14 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass reason="1024-bit key; unprotected key" header.d=sourceware.org header.i=@sourceware.org header.b=qwzB5T6y; dkim-adsp=none (unprotected policy); dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:message-id:in-reply-to:references:from:date :subject:to; q=dns; s=default; b=jtmHAaEjglHNaSa8zO8j+agU307kcY/ qbX0VZUE3cUcp/aC6umlAMCE3s6Ih5CsBYdRgFxXYTxLu68s5iz1N4dNgobfpDgw zwE/xZb0YFTfTQN/95e89qy65TnHYG965IS77rwU5jtPp7mcqcpYvwWJWfE8pPzq /7Fu2AXIHjIw= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:message-id:in-reply-to:references:from:date :subject:to; s=default; bh=z+BeFzuwmDBAE8zn68i0ozQ3lh0=; b=qwzB5 T6yEpgG+SfPOz6Bp9G0aP50GaB/yGPsvaO5atEKY1Jja+QwCdng+HMgl8MgjhMoZ EUju4wI6SdBE2rxPsTUtJScBzOu3jOBIT3XFP6VlSdcHzx52V13ZU6NqfHSEEehV Jgg9m0MxPxSNWEALY3FrndyW8hVcRHeTJK7rss= Received: (qmail 90776 invoked by alias); 2 Mar 2015 08:43:08 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 90767 invoked by uid 89); 2 Mar 2015 08:43:08 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.1 required=5.0 tests=AWL, BAYES_50, DATE_IN_PAST_12_24, SPF_HELO_PASS, T_RP_MATCHES_RCVD autolearn=no version=3.3.2 X-HELO: mx1.redhat.com Message-Id: <3854cd21faae8b7f74064fc7bcb3aba008533278.1425285061.git.fweimer@redhat.com> In-Reply-To: References: From: Florian Weimer Date: Sun, 1 Mar 2015 16:18:21 +0100 Subject: [PATCH 12/25] _nss_nis_initgroups_dyn: Use struct scratch_buffer instead of extend_alloca To: libc-alpha@sourceware.org Also adjusts the internal function get_uid. --- nis/nss_nis/nis-initgroups.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/nis/nss_nis/nis-initgroups.c b/nis/nss_nis/nis-initgroups.c index d22b241..80027bc 100644 --- a/nis/nss_nis/nis-initgroups.c +++ b/nis/nss_nis/nis-initgroups.c @@ -16,7 +16,6 @@ License along with the GNU C Library; if not, see . */ -#include #include #include #include @@ -27,6 +26,7 @@ #include #include #include +#include #include "nss-nis.h" #include @@ -120,27 +120,30 @@ internal_getgrent_r (struct group *grp, char *buffer, size_t buflen, static int get_uid (const char *user, uid_t *uidp) { - size_t buflen = sysconf (_SC_GETPW_R_SIZE_MAX); - char *buf = (char *) alloca (buflen); + struct scratch_buffer tmpbuf; + scratch_buffer_init (&tmpbuf); while (1) { struct passwd result; struct passwd *resp; - int r = getpwnam_r (user, &result, buf, buflen, &resp); + int r = getpwnam_r (user, &result, tmpbuf.data, tmpbuf.length, &resp); if (r == 0 && resp != NULL) { *uidp = resp->pw_uid; + scratch_buffer_free (&tmpbuf); return 0; } if (r != ERANGE) break; - buf = extend_alloca (buf, buflen, 2 * buflen); + if (!scratch_buffer_grow (&tmpbuf)) + return 1; } + scratch_buffer_free (&tmpbuf); return 1; } @@ -254,8 +257,6 @@ _nss_nis_initgroups_dyn (const char *user, gid_t group, long int *start, } struct group grpbuf, *g; - size_t buflen = sysconf (_SC_GETPW_R_SIZE_MAX); - char *tmpbuf; enum nss_status status; intern_t intern = { NULL, NULL, 0 }; gid_t *groups = *groupsp; @@ -264,15 +265,20 @@ _nss_nis_initgroups_dyn (const char *user, gid_t group, long int *start, if (status != NSS_STATUS_SUCCESS) return status; - tmpbuf = __alloca (buflen); + struct scratch_buffer tmpbuf; + scratch_buffer_init (&tmpbuf); do { while ((status = - internal_getgrent_r (&grpbuf, tmpbuf, buflen, errnop, + internal_getgrent_r (&grpbuf, tmpbuf.data, tmpbuf.length, errnop, &intern)) == NSS_STATUS_TRYAGAIN && *errnop == ERANGE) - tmpbuf = extend_alloca (tmpbuf, buflen, 2 * buflen); + if (!scratch_buffer_grow (&tmpbuf)) + { + status = NSS_STATUS_TRYAGAIN; + goto done; + } if (status != NSS_STATUS_SUCCESS) goto done; @@ -325,6 +331,7 @@ done: intern.start = intern.start->next; free (intern.next); } + scratch_buffer_free (&tmpbuf); return NSS_STATUS_SUCCESS; }