From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from seashell.cherry.relay.mailchannels.net (seashell.cherry.relay.mailchannels.net [23.83.223.162]) by sourceware.org (Postfix) with ESMTPS id 04DD2385CCAC for ; Tue, 26 Sep 2023 22:54:59 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 04DD2385CCAC Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=sourceware.org Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=sourceware.org 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 463E55012DB; Tue, 26 Sep 2023 22:54:58 +0000 (UTC) Received: from pdx1-sub0-mail-a267.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id D5BB15009B8; Tue, 26 Sep 2023 22:54:57 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1695768897; a=rsa-sha256; cv=none; b=A22Rjv4awmmj+UsXsz5ZXdkIJYJZjt+1uAXa3tER5/MKY445qd+OpCo1KIH1DobZeHmKn/ AoCMyQQ8OueF/sPTbEIif0pRya/enn7LKsd7N8SrjULo3LN4YPlvuinddSqfQoEqvrjq6g 3pHQg51dAiJQQsuR/Dqvju+LJa/o14MFPTeuIVTpl+7QAVr6TuEvS8HPxLWUdLHjjpc/bn hkfsj8y3Wrw4zJbXeQTaMxhAR4h3lvwZTrMO9jTgkhGMz1j+pBWjim13HM9Zp3N9KZQZOO tab2L0EGrXK2dV8UZ+dUkdxBlMpvIng+lBzn1fWpo3IivzpDdgvTR2MsjSJ/Fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1695768897; 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=6vVnFQq5QzNeKB2Tye8Qfwap0sdqSEfYCBn1ES2ES5o=; b=uHT3D9mOr/hqdqihnucvE18UAS41xAmdkJanHapx6WuzOOJyzeW6MR3hOpkL4jJ8uLgRDW WQQLLnSRCssoVFTcyPm78kwKdDFuGwT4Up6Szztz2quChvc4+kXM83nd7gJrBF0Wij/t2T THjEiaCsONszXP+9zmDjZSM0p+RR94sbRPDar3O4r+TsY6bPG45Wxl3V6g05StvFRJS4zJ enAJNRo5uw2sxiwFvMw6ay0plIOqGDNicUINXqzmRgo1Q1rFM+6sj0/fxAo32BFsueB9hb 43/HtMO6YniNPgjaTbhvyJvgnTb3rAdwSg0OuIsfm1R/8feB8aXdmg0wXTrwTA== ARC-Authentication-Results: i=1; rspamd-7d5dc8fd68-vjrnn; auth=pass smtp.auth=dreamhost smtp.mailfrom=siddhesh@sourceware.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org X-MC-Relay: Neutral X-MC-Copy: stored-urls X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Juvenile-Daffy: 1e9670a17c4f5b06_1695768898103_1209382606 X-MC-Loop-Signature: 1695768898103:2969245542 X-MC-Ingress-Time: 1695768898103 Received: from pdx1-sub0-mail-a267.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.109.140.241 (trex/6.9.1); Tue, 26 Sep 2023 22:54:58 +0000 Received: from fedora.redhat.com (bras-vprn-toroon4834w-lp130-02-142-113-138-41.dsl.bell.ca [142.113.138.41]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: siddhesh@gotplt.org) by pdx1-sub0-mail-a267.dreamhost.com (Postfix) with ESMTPSA id 4RwFSK3VnMzDg; Tue, 26 Sep 2023 15:54:57 -0700 (PDT) From: Siddhesh Poyarekar To: libc-stable@sourceware.org Cc: Romain Geissler Subject: [committed 2.38 1/2] Fix leak in getaddrinfo introduced by the fix for CVE-2023-4806 [BZ #30843] Date: Tue, 26 Sep 2023 18:54:27 -0400 Message-ID: <20230926225432.3304726-6-siddhesh@sourceware.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230926225432.3304726-1-siddhesh@sourceware.org> References: <20230926225432.3304726-1-siddhesh@sourceware.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1172.4 required=5.0 tests=BAYES_00,GIT_PATCH_0,KAM_DMARC_NONE,KAM_DMARC_STATUS,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_SOFTFAIL,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 List-Id: From: Romain Geissler This patch fixes a very recently added leak in getaddrinfo. This was assigned CVE-2023-5156. Resolves: BZ #30884 Related: BZ #30842 Reviewed-by: Siddhesh Poyarekar (cherry picked from commit ec6b95c3303c700eb89eebeda2d7264cc184a796) --- nss/Makefile | 20 ++++++++++++++++++++ nss/tst-nss-gai-hv2-canonname.c | 3 +++ sysdeps/posix/getaddrinfo.c | 4 +--- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/nss/Makefile b/nss/Makefile index 8a5126ecf3..668ba34b18 100644 --- a/nss/Makefile +++ b/nss/Makefile @@ -149,6 +149,15 @@ endif extra-test-objs += nss_test1.os nss_test2.os nss_test_errno.os \ nss_test_gai_hv2_canonname.os +ifeq ($(run-built-tests),yes) +ifneq (no,$(PERL)) +tests-special += $(objpfx)mtrace-tst-nss-gai-hv2-canonname.out +endif +endif + +generated += mtrace-tst-nss-gai-hv2-canonname.out \ + tst-nss-gai-hv2-canonname.mtrace + include ../Rules ifeq (yes,$(have-selinux)) @@ -217,6 +226,17 @@ endif $(objpfx)tst-nss-files-alias-leak.out: $(objpfx)/libnss_files.so $(objpfx)tst-nss-files-alias-truncated.out: $(objpfx)/libnss_files.so +tst-nss-gai-hv2-canonname-ENV = \ + MALLOC_TRACE=$(objpfx)tst-nss-gai-hv2-canonname.mtrace \ + LD_PRELOAD=$(common-objpfx)/malloc/libc_malloc_debug.so +$(objpfx)mtrace-tst-nss-gai-hv2-canonname.out: \ + $(objpfx)tst-nss-gai-hv2-canonname.out + { test -r $(objpfx)tst-nss-gai-hv2-canonname.mtrace \ + || ( echo "tst-nss-gai-hv2-canonname.mtrace does not exist"; exit 77; ) \ + && $(common-objpfx)malloc/mtrace \ + $(objpfx)tst-nss-gai-hv2-canonname.mtrace; } > $@; \ + $(evaluate-test) + # Disable DT_RUNPATH on NSS tests so that the glibc internal NSS # functions can load testing NSS modules via DT_RPATH. LDFLAGS-tst-nss-test1 = -Wl,--disable-new-dtags diff --git a/nss/tst-nss-gai-hv2-canonname.c b/nss/tst-nss-gai-hv2-canonname.c index d5f10c07d6..7db53cf09d 100644 --- a/nss/tst-nss-gai-hv2-canonname.c +++ b/nss/tst-nss-gai-hv2-canonname.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include "nss/tst-nss-gai-hv2-canonname.h" @@ -41,6 +42,8 @@ static void do_prepare (int a, char **av) static int do_test (void) { + mtrace (); + __nss_configure_lookup ("hosts", "test_gai_hv2_canonname"); struct addrinfo hints = {}; diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c index b2236b105c..13082305d3 100644 --- a/sysdeps/posix/getaddrinfo.c +++ b/sysdeps/posix/getaddrinfo.c @@ -1196,9 +1196,7 @@ free_and_return: if (malloc_name) free ((char *) name); free (addrmem); - if (res.free_at) - free (res.at); - free (res.canon); + gaih_result_reset (&res); return result; } -- 2.41.0