From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from cyan.elm.relay.mailchannels.net (cyan.elm.relay.mailchannels.net [23.83.212.47]) by sourceware.org (Postfix) with ESMTPS id 50A393858C83 for ; Tue, 8 Mar 2022 10:08:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 50A393858C83 X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id A198C6222E7; Tue, 8 Mar 2022 10:08:03 +0000 (UTC) Received: from pdx1-sub0-mail-a305.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 18E71621C33; Tue, 8 Mar 2022 10:07:47 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1646734082; a=rsa-sha256; cv=none; b=E2lFV5T5O37JwBxLJ6KfvMnTLhmsO6M6KEGPwpK4e3Scolqj8kCQWzO3E6aKowHlJz+cr2 UmfsdwNMXlQ4q3/IkVtKJ8IdIsq8OA82CbxYn0s+coAdqPXmjhupgcoMKMge/0eo4LT9X2 SHwXwCHUqJj0/EZzQYeDFgQ3qm++hMpZrVeWG66jhKeBqI1Wmd6DXxWKZrTqEDSws+dyGG PuztwnA3DfSCuPzgIvnMCkPH0S5qfvJ/VAc1yWpye+//tEbENgLnnsytR82oODDH8xKOz/ oXXPgKZNJf1ErZypry/gMdtn7viZMV/hYdNZThKihHZTQ9Rh7ND+F1NbpWqAEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1646734082; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EVSZ51jl62MSTU4V4ZSfnYHnlCeYhaOaOPo5p5O5asI=; b=J1vsc8GMQ26ZEGEaUkzKX08njMSkBbDBlEWv8cvqLnBxweg5qLCVUjE5tm04F//BfBiwg6 AYwe0X79+JtJsIdALh41CwW2ce92ZhwmlkoQt8gdZ3z2YuzZ2HEnpaSerEZ3MaSDyDfIkc Yy/9BPixKmMrMp8B0sEMHS6hVEj7A1Jhd8k6IwyJuR5AOYLQpAI6eatG1hx1qsK61QCvU4 QIGki4IRCkEbXzTfIKH3afXoTkreE/oXWiMD/NJyoCVT6lzYi8mRFcmZdK7XXixMYXbQYs mkgm1BIjZRpFxPByqvkpwYdeYNtBhL5oM0ehy2moy3QrzZPhOi/Qnl+eNkS2IQ== ARC-Authentication-Results: i=1; rspamd-c9cb649d9-47l9f; auth=pass smtp.auth=dreamhost smtp.mailfrom=siddhesh@sourceware.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from pdx1-sub0-mail-a305.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.124.31.75 (trex/6.5.3); Tue, 08 Mar 2022 10:08:03 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Attack-Trail: 28607d5b1aaa15ef_1646734083340_2948203479 X-MC-Loop-Signature: 1646734083340:2722243943 X-MC-Ingress-Time: 1646734083340 Received: from rhbox.redhat.com (unknown [1.186.224.155]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: siddhesh@gotplt.org) by pdx1-sub0-mail-a305.dreamhost.com (Postfix) with ESMTPSA id 4KCWGn0lP7z1PZ; Tue, 8 Mar 2022 02:07:44 -0800 (PST) From: Siddhesh Poyarekar To: libc-alpha@sourceware.org Cc: carlos@redhat.com, fweimer@redhat.com Subject: [PATCH 03/12] getaddrinfo: Fix leak with AI_ALL [BZ #28852] Date: Tue, 8 Mar 2022 15:37:08 +0530 Message-Id: <20220308100717.1006126-4-siddhesh@sourceware.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220308100717.1006126-1-siddhesh@sourceware.org> References: <20220308100717.1006126-1-siddhesh@sourceware.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3493.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_NONE, KAM_DMARC_STATUS, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NEUTRAL, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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-List-Received-Date: Tue, 08 Mar 2022 10:08:07 -0000 Use realloc in convert_hostent_to_gaih_addrtuple and fix up pointers in the result list so that a single block is maintained for hostbyname3_r/hostbyname2_r and freed in gaih_inet. This result is never merged with any other results, since the hosts database does not permit merging. Resolves BZ #28852. Signed-off-by: Siddhesh Poyarekar --- sysdeps/posix/getaddrinfo.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c index df164a3e96..0ec85dc4bd 100644 --- a/sysdeps/posix/getaddrinfo.c +++ b/sysdeps/posix/getaddrinfo.c @@ -199,9 +199,6 @@ convert_hostent_to_gaih_addrtuple (const struct addrinfo *req, struct hostent *h, struct gaih_addrtuple **result) { - while (*result) - result = &(*result)->next; - /* Count the number of addresses in h->h_addr_list. */ size_t count = 0; for (char **p = h->h_addr_list; *p != NULL; ++p) @@ -212,10 +209,30 @@ convert_hostent_to_gaih_addrtuple (const struct addrinfo *req, if (count == 0 || h->h_length > sizeof (((struct gaih_addrtuple) {}).addr)) return true; - struct gaih_addrtuple *array = calloc (count, sizeof (*array)); + struct gaih_addrtuple *array = *result; + size_t old = 0; + + while (array) + { + old++; + array = array->next; + } + + array = realloc (*result, (old + count) * sizeof (*array)); + if (array == NULL) return false; + *result = array; + + /* Update the next pointers on reallocation. */ + for (size_t i = 0; i < old; i++) + array[i].next = array + i + 1; + + array += old; + + memset (array, 0, count * sizeof (*array)); + for (size_t i = 0; i < count; ++i) { if (family == AF_INET && req->ai_family == AF_INET6) @@ -235,7 +252,6 @@ convert_hostent_to_gaih_addrtuple (const struct addrinfo *req, array[0].name = h->h_name; array[count - 1].next = NULL; - *result = array; return true; } -- 2.35.1