From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dog.birch.relay.mailchannels.net (dog.birch.relay.mailchannels.net [23.83.209.48]) by sourceware.org (Postfix) with ESMTPS id D926F385C6EE for ; Tue, 26 Sep 2023 22:54:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D926F385C6EE 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 7F92E900752; Tue, 26 Sep 2023 22:54:57 +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 1AD8A9015CC; 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=lC6FwJ/qj2Yhs8Y5tmPlT6XVlj4YICuawmTXB6fxhTH8NvUSz1Qa1QEZ7SxpIAJyz3u1UT peIlWXSfD++RH97VWZKWdi9yuO59tX1KcnS5fmdqnws52vpBOl0itF2sEubDwHUN/UtQRV etNec6WESIF9Pd/8rz0xQvJ86pr5hB9QSwt9lJCefmrHSea3EWY/e4Vjh4pp6z2ztB0Jfr AoegZv9M461DSMPLQYCWqkIddSw6TBApPmaXGnk/iNKuSXdfpmAiaUXHSpveHsEpFWehxP 4s9eKrG2GZ1R50QFcRhPUVnlzPpF+vswqWyAGdieaVhH4eG34r1j1zsgRy7K7g== 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=DbtzHn0UvarcHcHM45d4KXi/J3wDwbX2JsiRvRFQhvc=; b=fRJbil4w6dwPaGd933QiZxA0fxP/fDohmWz931LZPb1lBSXR495g/qGkmJD6hMDT6ow8mo Nh1Sjz6kqd87EzCI/41O5DSA0rPYl8e7hIXFjD1aU6PourjWiY0rRldVtumqHyqtbngQXC xp1Ylmp60/HmbAH356Dr/rJ5Iz5mMRQdvl8I0e7Jahez1Tv+7Kn0KDZZAL1/faKLtKjks/ bUFndpCv8VpMrU1lvkzGiXBIQs4eRerO3bAsVe9IryCwy8NWjpfkAJxAqIkpCW8lp3dtkE VGfTOcuXBLSzfZvzoO8sluifOE9/YbsgvT4+vwy8u5xjvAbo1jxMyDSsNdJ1cA== ARC-Authentication-Results: i=1; rspamd-7d5dc8fd68-4crxj; 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-Dime-Shoe: 5fcfb6493d028be0_1695768897344_1283091962 X-MC-Loop-Signature: 1695768897344:824327723 X-MC-Ingress-Time: 1695768897344 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.110.212 (trex/6.9.1); Tue, 26 Sep 2023 22:54:57 +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 4RwFSJ510Sz2X; Tue, 26 Sep 2023 15:54:56 -0700 (PDT) From: Siddhesh Poyarekar To: libc-stable@sourceware.org Cc: Romain Geissler Subject: [committed 2.36 1/2] Fix leak in getaddrinfo introduced by the fix for CVE-2023-4806 [BZ #30843] Date: Tue, 26 Sep 2023 18:54:25 -0400 Message-ID: <20230926225432.3304726-4-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_H2,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 f0af87e6f1..7a52c68791 100644 --- a/nss/Makefile +++ b/nss/Makefile @@ -148,6 +148,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)) @@ -216,6 +225,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 7a43a3bf4c..f975dcd2bc 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