From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 71C8D385828D for ; Wed, 27 Sep 2023 20:55:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 71C8D385828D Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1695848130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=f2POOYMMGd6O4hbz7oWW0yscfvNbQDNyi1qEkzDW0kA=; b=dxtDdnvLvNYWZ792yOnk2hhosADgGltGUDqOpDCxqMyXSABbLFNluG2Awcc+JyCahxHwhQ 75XAOmHNwwLtZUqNKqfybc8qVgfJkWtwW/VFOd5GFiU3sZqyZS7H4qGtULQH+irEZUPq0H fVuBcyjATwJ4rRCy8iopkNsHt0Ul544= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-620-m4tJ3sfoMaSm4cJmn9AvSg-1; Wed, 27 Sep 2023 16:55:28 -0400 X-MC-Unique: m4tJ3sfoMaSm4cJmn9AvSg-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7AB6B8015AB; Wed, 27 Sep 2023 20:55:28 +0000 (UTC) Received: from oak (unknown [10.22.34.25]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5BE61492C37; Wed, 27 Sep 2023 20:55:28 +0000 (UTC) Date: Wed, 27 Sep 2023 16:55:27 -0400 From: Joe Simmons-Talbott To: Andreas Schwab Cc: libc-alpha@sourceware.org Subject: Re: [PATCH] nss: Get rid of alloca usage in db-XXX Message-ID: <20230927205527.GA4098455@oak> References: <20230927153831.2638026-1-josimmon@redhat.com> MIME-Version: 1.0 In-Reply-To: X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: On Wed, Sep 27, 2023 at 05:55:05PM +0200, Andreas Schwab wrote: > On Sep 27 2023, Joe Simmons-Talbott wrote: > > > Replace alloca usage with a scratch_buffer. > > --- > > nss/nss_db/db-XXX.c | 12 +++++++++++- > > 1 file changed, 11 insertions(+), 1 deletion(-) > > > > diff --git a/nss/nss_db/db-XXX.c b/nss/nss_db/db-XXX.c > > index 0ce730db5a..2df31a8077 100644 > > --- a/nss/nss_db/db-XXX.c > > +++ b/nss/nss_db/db-XXX.c > > @@ -18,6 +18,7 @@ > > > > #include > > #include > > +#include > > #include > > #include > > #include > > @@ -126,6 +127,8 @@ enum nss_status \ > > char *buffer, size_t buflen, int *errnop H_ERRNO_PROTO)\ > > { \ > > struct parser_data *data = (void *) buffer; \ > > + struct scratch_buffer sbuf; \ > > + scratch_buffer_init (&sbuf); \ > > \ > > if (buflen < sizeof *data) \ > > { \ > > @@ -160,7 +163,13 @@ enum nss_status \ > > else \ > > { \ > > const size_t size = (keysize) + 1; \ > > - key = alloca (size); \ > > + if (!scratch_buffer_set_array_size (&sbuf, 1, size)) \ > > + { \ > > + H_ERRNO_SET (NETDB_INTERNAL); \ > > + status = NSS_STATUS_TRYAGAIN; \ > > + return status; \ > > That needs to set *errnop and goto out. > Thanks. Fixed in v2. I left the H_ERRNO_SET call in there as I wasn't sure if I needed it or not. Thanks, Joe