From patchwork Wed Sep 27 20:49:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Simmons-Talbott X-Patchwork-Id: 1840447 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=HJqlgLI8; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Rwpdj4tPrz1ynX for ; Thu, 28 Sep 2023 06:50:01 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A286A386193D for ; Wed, 27 Sep 2023 20:49:59 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org 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 2DDDA385828D for ; Wed, 27 Sep 2023 20:49:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2DDDA385828D 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=1695847789; 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: content-transfer-encoding:content-transfer-encoding; bh=P1CqTrFUTBEwHGO+MTMYTj9rwPm1Ku7z7zHF+fwSpyA=; b=HJqlgLI8yQGajj4enVf/KhZ2FgXCnx+Q3P4zXgkfzgK1WvaH9fpPofLdUowa4dIWPgwNKS j0G8ZoYbrYl9PeYCidPFP1bHfnwksNuhoqRyLao5935JxqnF1f1M5HD9H22Nd/eZYm5+n3 xdb9Fc8iFF12curFIX5d1O+597IRGpg= Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-648-z4SOMvvJNNyWFKjHowwpXQ-1; Wed, 27 Sep 2023 16:49:48 -0400 X-MC-Unique: z4SOMvvJNNyWFKjHowwpXQ-1 Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-65af7d202a3so157705496d6.0 for ; Wed, 27 Sep 2023 13:49:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695847788; x=1696452588; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=P1CqTrFUTBEwHGO+MTMYTj9rwPm1Ku7z7zHF+fwSpyA=; b=h3/Afd5El0AmidvYXdfUmqHMnh0seV4Rx9Nah4MX18gt9g8IVJ4bHAoylHiuPhmEpF G1ltLyzBywp51uAgIE1Fci6LlVv1t5+FsoZkoDROaseyK/IV09Op45m0oV42ptd+eK4H 9Qg3E40C9yVhj46O/g5czCZbOqfBsZ1uxSUX2aDDemzQudEGCiKsqDOlLEgI9hEN1+ne Q6FN0mC4VEZmGnrU3g8lNgdLyI0DPrZyiHI8S+I9AhB/qMS01N2yo7yHdOapc5bahEAe T6S9pqmHcKGr4D7ypHzbR2fFHeHS9Sj4D1guYHJfp/te4/s2CRD9BN2Q9evuUozXFFhx IPug== X-Gm-Message-State: AOJu0Yzzj/hwc2RlCOK91m1ZWf3ueyKO52pXJdfTJet5YLSqkfu4r7tL Pku1hsFia8L58EtOVHznPqCak9xilMXdXUYGLx10mCix2XTij97OW+VLvbWzgtk3/YyCMjkW1F2 h5YcLlPoCPBAOlThwPkYPiGVMBNGmgqvs/ejfH3rMwrxcd9d6VEV3YxjStrLRQNTNI8g3somsqW h2PZt5 X-Received: by 2002:a0c:cb8e:0:b0:65b:1074:fa5a with SMTP id p14-20020a0ccb8e000000b0065b1074fa5amr2867036qvk.65.1695847787820; Wed, 27 Sep 2023 13:49:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFp0DtRt2i/9EeKlKaS2R6RkilveTUjvR+jv8SJ5ri5cKjjxmduKB3iCCd3PboYCkQ8OSBzVw== X-Received: by 2002:a0c:cb8e:0:b0:65b:1074:fa5a with SMTP id p14-20020a0ccb8e000000b0065b1074fa5amr2867026qvk.65.1695847787527; Wed, 27 Sep 2023 13:49:47 -0700 (PDT) Received: from oak.redhat.com (c-71-206-142-238.hsd1.va.comcast.net. [71.206.142.238]) by smtp.gmail.com with ESMTPSA id n6-20020a0ce486000000b0065cfb75fe81sm813987qvl.67.2023.09.27.13.49.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Sep 2023 13:49:46 -0700 (PDT) From: Joe Simmons-Talbott To: libc-alpha@sourceware.org Cc: Joe Simmons-Talbott Subject: [PATCH v2] nss: Get rid of alloca usage in db-XXX Date: Wed, 27 Sep 2023 16:49:41 -0400 Message-ID: <20230927204944.3578445-1-josimmon@redhat.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.7 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 X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Replace alloca usage with a scratch_buffer. --- nss/nss_db/db-XXX.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/nss/nss_db/db-XXX.c b/nss/nss_db/db-XXX.c index 0ce730db5a..012446fed8 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,14 @@ enum nss_status \ else \ { \ const size_t size = (keysize) + 1; \ - key = alloca (size); \ + if (!scratch_buffer_set_array_size (&sbuf, 1, size)) \ + { \ + *errnop = ENOMEM; \ + H_ERRNO_SET (NETDB_INTERNAL); \ + status = NSS_STATUS_TRYAGAIN; \ + goto out; \ + } \ + key = sbuf.data; \ \ KEYPRINTF keypattern; \ } \ @@ -216,6 +226,7 @@ enum nss_status \ \ out: \ internal_endent (&state); \ + scratch_buffer_free (&sbuf); \ \ return status; \ }