From patchwork Fri Jun 30 14:30:50 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: 1801996 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=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=gIC6gOXu; dkim-atps=neutral Received: from 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 4QsyRk4bJVz20ZV for ; Sat, 1 Jul 2023 00:31:14 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4DD5138768A5 for ; Fri, 30 Jun 2023 14:31:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4DD5138768A5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1688135472; bh=id2U34xYeZPz1mmpfinKxntN4rkEel8If4Uy5YdoKJk=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=gIC6gOXuu8SWJ3bRJG/a4Qa8Je0yB8y5tckyEH6J9re5sMpShkI7CiCW28jTbWUuL 1Bui3jzkIKn8xG3CAtBANtcatYn0jV+1zV+VWEpZwXR0iUsB4eWQyOgCGkQdkrRKq9 9VL89Gl9eLNLroOwdMjll1R3ZNiIG3vRLFRV7jm0= 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.129.124]) by sourceware.org (Postfix) with ESMTPS id 3B9D23871020 for ; Fri, 30 Jun 2023 14:30:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3B9D23871020 Received: from mail-qt1-f197.google.com (mail-qt1-f197.google.com [209.85.160.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-443-0d2LIollPPugNHfhO5VSOw-1; Fri, 30 Jun 2023 10:30:55 -0400 X-MC-Unique: 0d2LIollPPugNHfhO5VSOw-1 Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-400fea3d458so21353521cf.1 for ; Fri, 30 Jun 2023 07:30:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1688135455; x=1690727455; 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=id2U34xYeZPz1mmpfinKxntN4rkEel8If4Uy5YdoKJk=; b=kFZmr/NM8DNZ4/s1/h8ehvyhAKwXNj+2+5fqeXOugmCiYkQlVng/GZ17OUF1l3qqYJ yPBle37SnIN53ESzR6dIKC5pO4ZOAyorsi2FjrF9JtZOIOW3idhexiXOW79SMOU0aqkv DzP6y0sfkVrLKeampwmGRy1nxNvAL1enbNFJnN+LANTT72lVlS79QGZ7kZL435Xs4yCP /AknSsQ0zqU++t3XXHPeF25efO2sRdvtfYDaNi/dETJ1Uftz4i3XpnpX7rRhpX/prFSL ThKP7a01hLnwZPmSvIGV3f1znRLgetix4+Cdk+Q/CJ3N+d6FN/Zo2rqYghKeKCiKX/p9 9fvg== X-Gm-Message-State: AC+VfDx1OkTPMVzSenIA3j4qr8V7sTilTNlr0zt7m14HZ84UTlGm23Sc 1iBWQZD7u9eG5bIoz/tjcStOveTgyp904QRH/1GvL0jHVCu8qFECa5PXrs8IK7+HOSHQOPQTBM3 UeLUBuUofaiiyKMuyrMi61GqeeuId0QPm5s25KOVT+km+mXKx69Z/1B2VZt1btLqOVB8E2P9UrM OI59ad X-Received: by 2002:a05:622a:110:b0:400:aa4d:7a5d with SMTP id u16-20020a05622a011000b00400aa4d7a5dmr3372766qtw.24.1688135454697; Fri, 30 Jun 2023 07:30:54 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7IsKX4tyI+XcxOkEftzPnr9odJyn3KCu+80brGVtQfE03PNbj8dDkjvpl6i2SQdyBinAnqpw== X-Received: by 2002:a05:622a:110:b0:400:aa4d:7a5d with SMTP id u16-20020a05622a011000b00400aa4d7a5dmr3372732qtw.24.1688135454225; Fri, 30 Jun 2023 07:30:54 -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 fb6-20020a05622a480600b003ff1f891206sm3743147qtb.61.2023.06.30.07.30.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jun 2023 07:30:53 -0700 (PDT) To: libc-alpha@sourceware.org Cc: Joe Simmons-Talbott Subject: [PATCH v2] getaddrinfo: Get rid of alloca Date: Fri, 30 Jun 2023 10:30:50 -0400 Message-Id: <20230630143050.3334599-1-josimmon@redhat.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.5 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, T_SCC_BODY_TEXT_LINE 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" Use a scratch_buffer rather than alloca to avoid potential stack overflow. --- Changes to v1: * Don't use alloc_size but rather rely on * scratch_buffer_set_array_size's overflow checks. sysdeps/posix/getaddrinfo.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c index 0356b622be..be3b3f6e45 100644 --- a/sysdeps/posix/getaddrinfo.c +++ b/sysdeps/posix/getaddrinfo.c @@ -2404,22 +2404,17 @@ getaddrinfo (const char *name, const char *service, struct addrinfo *q; struct addrinfo *last = NULL; char *canonname = NULL; - bool malloc_results; - size_t alloc_size = nresults * (sizeof (*results) + sizeof (size_t)); + struct scratch_buffer buf; + scratch_buffer_init (&buf); - malloc_results - = !__libc_use_alloca (alloc_size); - if (malloc_results) + if (!scratch_buffer_set_array_size (&buf, nresults, + sizeof (*results) + sizeof (size_t))) { - results = malloc (alloc_size); - if (results == NULL) - { - __free_in6ai (in6ai); - return EAI_MEMORY; - } + __free_in6ai (in6ai); + return EAI_MEMORY; } - else - results = alloca (alloc_size); + results = buf.data; + order = (size_t *) (results + nresults); /* Now we definitely need the interface information. */ @@ -2590,8 +2585,7 @@ getaddrinfo (const char *name, const char *service, /* Fill in the canonical name into the new first entry. */ p->ai_canonname = canonname; - if (malloc_results) - free (results); + scratch_buffer_free (&buf); } __free_in6ai (in6ai);