From patchwork Mon Aug 14 14:58:18 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: 1821047 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=QDFsDpug; dkim-atps=neutral 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 (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RPcws6h2Nz1yfP for ; Tue, 15 Aug 2023 00:58:53 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CDB083858423 for ; Mon, 14 Aug 2023 14:58:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CDB083858423 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1692025131; bh=2cmUxnG4Pg3iriQzJNMrnxdbWgubxEUG/+1esc2D+lg=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=QDFsDpugEtpj8hVNKAGKnvAyXb4y2zQzIU2p+XF57XxB4KKH8Tw8uTsRDU4Mbzqpn hTG+tDG65teoSOHQwlTwPye2tgFRPmVrOHpVFO0QV3M7AJupfXk8Zmly5STxLuS2Rm w5lpmF+JruyxH4qhipkqCHiYRSTDLFCgOT70tEm4= 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 B40DB3858C20 for ; Mon, 14 Aug 2023 14:58:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org B40DB3858C20 Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-554-r7_DBX49PuaZAU5ENwmV_A-1; Mon, 14 Aug 2023 10:58:36 -0400 X-MC-Unique: r7_DBX49PuaZAU5ENwmV_A-1 Received: by mail-qk1-f199.google.com with SMTP id af79cd13be357-76c93466e4cso476954285a.3 for ; Mon, 14 Aug 2023 07:58:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692025115; x=1692629915; 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=2cmUxnG4Pg3iriQzJNMrnxdbWgubxEUG/+1esc2D+lg=; b=dhMvC5OB2EIBQ8Dz7vGmBMD+4TkDwaCQcHJ/WuxRzdhtbt7jVLOi9OCPWKRQF90hGR 0Q9pm2k4Q6BQsY2ZTs5rFbFRudiwtj8rqVbDfgeH3P/Fp66vCdqq1VrKiJqjH7bcOma/ iFxxiLiriDSfeQivP0MBpANzkXcscogsaXLWigJ2LZ7z3z6epklucBM+/Aw6VsJCGRlo p6BK2jWdG44a0mgCl4sKbElepnYCDYOJoVqHRVgXE1y/QRmrR2Z2SzPUSP1iIt0aySnV DXDiiz3DQ/S4bX4kMyx8l5MLNsLogkCqCdD9Rq2kEwEpzKGzHNBm5kVd5HlRBdqdEH8+ 0Rkg== X-Gm-Message-State: AOJu0YwOUmkl51jLWte3HovZw67NhUuNl+t4V0TNkzkZ7ymoHw8G4KZD BpiFM2YxLVAfZbXI5GbsKqGK8dsR0xJZsDGdnb16Sh5EJSYymVQm66WHGHrkoAa+KPP2m+qJz7C qCf+ZPPpXydpmb3xWiuOyjedeY94Wze8zJC0vvOyGaJhBQwNzGiEM5GURguWpQtXG4gRJIaMEqs snZ5Cl X-Received: by 2002:a05:620a:4492:b0:765:7d7b:7197 with SMTP id x18-20020a05620a449200b007657d7b7197mr12726824qkp.31.1692025115329; Mon, 14 Aug 2023 07:58:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGwwFib3ebl/P2xAn29boFKsFh0aQJyz8SilJuACZuXBlc+6boyJCnklghbl8WMX7zpHTjG7Q== X-Received: by 2002:a05:620a:4492:b0:765:7d7b:7197 with SMTP id x18-20020a05620a449200b007657d7b7197mr12726807qkp.31.1692025114935; Mon, 14 Aug 2023 07:58:34 -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 6-20020a05620a070600b0076cbcf8ad3bsm3035183qkc.55.2023.08.14.07.58.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Aug 2023 07:58:34 -0700 (PDT) To: libc-alpha@sourceware.org Cc: Joe Simmons-Talbott Subject: [PATCH v4] resolv/nss_dns/dns-host: Get rid of alloca. Date: Mon, 14 Aug 2023 10:58:18 -0400 Message-ID: <20230814145833.1679316-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.6 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_H4, 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.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Joe Simmons-Talbott via Libc-alpha From: Joe Simmons-Talbott Reply-To: Joe Simmons-Talbott Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" Since the alloca is a small constant size use an array instead. Reviewed-by: Siddhesh Poyarekar --- Changes to v3: * Move tmp back up one level of scope since it is used within the enclosing scope as 'name'. resolv/nss_dns/dns-host.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c index 1d60c51f5e..c8b77bbc35 100644 --- a/resolv/nss_dns/dns-host.c +++ b/resolv/nss_dns/dns-host.c @@ -378,6 +378,7 @@ _nss_dns_gethostbyname4_r (const char *name, struct gaih_addrtuple **pat, int *herrnop, int32_t *ttlp) { enum nss_status status = check_name (name, herrnop); + char tmp[NS_MAXDNAME]; if (status != NSS_STATUS_SUCCESS) return status; struct resolv_context *ctx = __resolv_context_get (); @@ -395,8 +396,7 @@ _nss_dns_gethostbyname4_r (const char *name, struct gaih_addrtuple **pat, */ if (strchr (name, '.') == NULL) { - char *tmp = alloca (NS_MAXDNAME); - const char *cp = __res_context_hostalias (ctx, name, tmp, NS_MAXDNAME); + const char *cp = __res_context_hostalias (ctx, name, tmp, sizeof (tmp)); if (cp != NULL) name = cp; }