From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from bee.birch.relay.mailchannels.net (bee.birch.relay.mailchannels.net [23.83.209.14]) by sourceware.org (Postfix) with ESMTPS id 5338C3857406 for ; Mon, 14 Mar 2022 09:49:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 5338C3857406 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 EF55292179D for ; Mon, 14 Mar 2022 09:49:05 +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 8C3C99213F5 for ; Mon, 14 Mar 2022 09:49:05 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1647251345; a=rsa-sha256; cv=none; b=Xa4m3ZWy3Hfh9wiZbd9ETXhacHyPT+8jXPMbshxejLQ1xgUish3mGRPbggX07BWC5178zm kNoJuBLHMuT/XMAXQ6epW6BS4t1MRbA2/t7zdbcqwq/UKeSCzV5uWPGg0o8aOMARkl7ug8 ZJBahtp1BJTOxQQpWNkDPdeMCneC/CiHsnlVoThq/uOhaXMjlsw0Esoi4u04de2WczkrqO p/EVF+SM1g7bawu2p99ydz+Ag7e5g3PfgF6sl6In9W/35hTMgE/fBiH5Gal1BxwbYJzMf6 WlXRmGDHwwH/QD4V5OuEex5kr5xl1zjsIoADQDlsnTUcARRAgbRdTNPuPiqzXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1647251345; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rlheFMapcGvzLCsRGYB3Fc+mebHYG36P3QL3GCA9SZQ=; b=OVfdAGgTH7PV5BarqTwxYt4CUgj+GcfQxIvqOiwhQMxn9Utb7A31+Czpi7jeZ/lQ6TYuqJ qbL00qNwdRMbSrnz91nGP9VAhyRsKy7FNuHzC/FFqW7GEpboYysfSQs9eelEdR3cbJHCjX c52TbhkGW7NtqHEzYauwd42+FtPMhi6uGhOwnUxMT89PsR6mxOSqDvzSkA0p0LMH7uGPdN cUbMUR9NqTFMeDOLQntvjhtt1qCaE0dFHpk+Ewo/6WSuDF8ZvurbfkRKCZx2g5UoicfXLH W36+9xMjPG3+SJZKRNQ4mb0q5DOi0kknAcF21k6PMYAOusWjX8fZGyk3W7IZXg== ARC-Authentication-Results: i=1; rspamd-c9cb649d9-r8jmt; 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.102.18.7 (trex/6.5.3); Mon, 14 Mar 2022 09:49:05 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Versed-Lyrical: 5a01b97a024f4833_1647251345848_3208106969 X-MC-Loop-Signature: 1647251345848:3194207888 X-MC-Ingress-Time: 1647251345848 Received: from rhbox.redhat.com (unknown [106.220.192.183]) (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 4KHBZ90wx6z36 for ; Mon, 14 Mar 2022 02:48:48 -0700 (PDT) From: Siddhesh Poyarekar To: libc-alpha@sourceware.org Subject: [PATCH v2 03/12] getaddrinfo: Fix leak with AI_ALL [BZ #28852] Date: Mon, 14 Mar 2022 15:18:26 +0530 Message-Id: <20220314094835.1159523-4-siddhesh@sourceware.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220314094835.1159523-1-siddhesh@sourceware.org> References: <20220308100717.1006126-1-siddhesh@sourceware.org> <20220314094835.1159523-1-siddhesh@sourceware.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1170.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_NONE, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, 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: Mon, 14 Mar 2022 09:49:09 -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..b0a64ead0e 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 != NULL) + { + 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