From patchwork Tue Sep 26 20:17:13 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: 76727 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 9619C385CCAB for ; Tue, 26 Sep 2023 20:17:34 +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 908E83858C27 for ; Tue, 26 Sep 2023 20:17:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 908E83858C27 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=1695759442; 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=VIn3/IU+RGdeNWlwvSaYNZTTzFDZLoRNYLCvFXKvnrk=; b=KcFP8bRRIwU2Sg7rhfQD5EvCEIxAptxMdw3RIJW3KqhoJSoWjmyfTiiqgdNLjmW//xl3pz E2pK2JPgooiOJXMC3KUs72ZO4uRbzmFCj4rv509ZmwcKZ2wAlHEEp48e7Jk0FD2z4x7Uyg wC6hIt34c5DJuE7xyfj+ktvKJ79D5/g= Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-84-1Q_O6tJeOAWbs1Z-MLxe-g-1; Tue, 26 Sep 2023 16:17:21 -0400 X-MC-Unique: 1Q_O6tJeOAWbs1Z-MLxe-g-1 Received: by mail-qt1-f198.google.com with SMTP id d75a77b69052e-4180b3527c7so117053371cf.2 for ; Tue, 26 Sep 2023 13:17:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695759440; x=1696364240; 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=VIn3/IU+RGdeNWlwvSaYNZTTzFDZLoRNYLCvFXKvnrk=; b=XB81GkniSLGaKqJNdzyUsDq4AeMg63sy0EBeGghzgU9tpyskx9sY1Q0Cu03rfjdu8G wROsM0J85wA4XHUpXzzvY7I+apzDBBRtOXElhtp96BUPBusFRcgNYfUyma+5bEZYmqh+ 1ET3G76eJl0EBUjETAImpsKMmNLYrUsIYKvWTn+rcrLZe0NQSezeoB1eQ+EDTe34ZpGM rS8LWkCUIke2UavJYE2bpGytMkstPfHtS3tTK298AD663SlU0gRsnwAAc2vBYomWROBo 6BExqndM04qkgf7wL4GSQbi9BLgt0Ob9+M6m3N1KBnA+ndq4Q66iE1bVVIZ/L+xXplR9 kgaw== X-Gm-Message-State: AOJu0YxZsbsDDFEV1fEyquP73+8PdZ5FrOCCestORTUPhB9t+4rscSDS 8LXbiVlq7URea0uSM4Mvg8Rn6e7gxMA0mWVjBX7R3bi0YhjNMrrr0vOWj9yI6ETUgwlfelhSFX8 TdvYQ/8d45i1/pEb3yWE61SFDOsxoog+4+/vpZN9Fz8x+3d4N5bc6xD5uHA8tp6+5IbxKpsH3oo hBhEWu X-Received: by 2002:ac8:5b09:0:b0:417:fd7e:2154 with SMTP id m9-20020ac85b09000000b00417fd7e2154mr15164510qtw.9.1695759440324; Tue, 26 Sep 2023 13:17:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFCREQgLzfsL1HC+KKvFgvNBLymZNU37+MwzGk++LjME5KN9hO7ynFJZtwsJkben3nlrUil6g== X-Received: by 2002:ac8:5b09:0:b0:417:fd7e:2154 with SMTP id m9-20020ac85b09000000b00417fd7e2154mr15164495qtw.9.1695759440089; Tue, 26 Sep 2023 13:17:20 -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 d8-20020ac81188000000b00411fcc18cc1sm4872294qtj.64.2023.09.26.13.17.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Sep 2023 13:17:19 -0700 (PDT) From: Joe Simmons-Talbott To: libc-alpha@sourceware.org Cc: Joe Simmons-Talbott Subject: [PATCH] nss: Get rid of alloca usage in files-network's parse_line Date: Tue, 26 Sep 2023 16:17:13 -0400 Message-ID: <20230926201717.1201494-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+patchwork=sourceware.org@sourceware.org Replace alloca usage with a scratch_buffer. --- nss/nss_files/files-network.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/nss/nss_files/files-network.c b/nss/nss_files/files-network.c index c010d21fde..58072ca6b4 100644 --- a/nss/nss_files/files-network.c +++ b/nss/nss_files/files-network.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -37,6 +38,8 @@ LINE_PARSER char *addr; char *cp; int n = 1; + struct scratch_buffer sbuf; + scratch_buffer_init (&sbuf); STRING_FIELD (result->n_name, isspace, 1); @@ -58,7 +61,11 @@ LINE_PARSER } if (n < 4) { - char *newp = (char *) alloca (strlen (addr) + (4 - n) * 2 + 1); + if (!scratch_buffer_set_array_size ( + &sbuf, 1, strlen (addr) + (4 - n) * 2 + 1)) + return -1; + char *newp = sbuf.data; + cp = stpcpy (newp, addr); do { @@ -71,6 +78,7 @@ LINE_PARSER } result->n_net = __inet_network (addr); result->n_addrtype = AF_INET; + scratch_buffer_free (&sbuf); })