From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from cheetah.ash.relay.mailchannels.net (cheetah.ash.relay.mailchannels.net [23.83.222.34]) by sourceware.org (Postfix) with ESMTPS id 6E05B3858C5F for ; Mon, 25 Sep 2023 00:21:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6E05B3858C5F Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=gotplt.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gotplt.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 9CD16361E24; Mon, 25 Sep 2023 00:21:12 +0000 (UTC) Received: from pdx1-sub0-mail-a279.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 3E320361F1F; Mon, 25 Sep 2023 00:21:12 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1695601272; a=rsa-sha256; cv=none; b=5QHo7H1E7+1x5lGN6T1zHSuRSex1/m5jHg8nUwmLq1Hbo3MSH8z3rOlwbB8brsiqN6oZ7w JyEGDy6bKROC+V1Iw6Bx8t4iEPXAIP5nlOi27xXDb4n3XSOlNcouFnY2KEGvVw0uRZvlxY mQj2uPx4JL9FIg0BLi1DvLezt1X5sVzKeV1pd60bqEOxfv+bFuONBsQmhOAZBn94F+eR22 pCp8P5WCds8GwHhFdUpna32GwpB//63nqgyn1kHUnLXVyxpTwbVBhWn24KwDP79JUz4XU1 K3RN2njnvBlInp3EUkFQVJJZ4yMcwbKmc3w13hRvxjYCUaSO0QNSGOM6upHT+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1695601272; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=pEWx4iD1J3HMj3KbOQ8ogikkIsERIcN5AMGpBvqZ09M=; b=vy8qE+LO+BvytRphqVF1lCpevAXEnfgIenER9REOA4GNbdZFk50c85F2c8+mV4PPibbeil 1D8ZkZOAKERwLgBSMivDAst3KQrDjRhX5fTT9GsL5GMHHDIrRVoijJB6r+Dw5C5IIWYa9O SwoLBnroAFyhHYuDQPLl4+THDEJ1NvvRsuBY07umgYmvDqZJ43umpwbnTom25wnMUVtMmL 1B3OmdOVMk0/G6I1qdI4A3XkpSqEdqW0ltXT5voi2MfQGaoqJDUT1WnFMp0f0s0BBAPlOB MZ732aGXde6b5H3aYf7y48eqB2JaLMgnS5p/jWPRWJ0Bo5qb4kNmqlPgs1118g== ARC-Authentication-Results: i=1; rspamd-7c449d4847-dmljk; auth=pass smtp.auth=dreamhost smtp.mailfrom=siddhesh@gotplt.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Zesty-Spicy: 1a2d09297ad15162_1695601272480_2783807064 X-MC-Loop-Signature: 1695601272480:2782016688 X-MC-Ingress-Time: 1695601272480 Received: from pdx1-sub0-mail-a279.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.122.94.6 (trex/6.9.1); Mon, 25 Sep 2023 00:21:12 +0000 Received: from [10.0.0.41] (host-92-18-245-58.as13285.net [92.18.245.58]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) (Authenticated sender: siddhesh@gotplt.org) by pdx1-sub0-mail-a279.dreamhost.com (Postfix) with ESMTPSA id 4Rv3Sl4Q6bz6X; Sun, 24 Sep 2023 17:21:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gotplt.org; s=dreamhost; t=1695601272; bh=pEWx4iD1J3HMj3KbOQ8ogikkIsERIcN5AMGpBvqZ09M=; h=Date:Subject:To:From:Content-Type:Content-Transfer-Encoding; b=qgQ8FVSbE800buysBmTPktLzZkCnP8iaqaDBf48ktGfCa/64yx11DZW5tfz6dyIed V+hf7PXyAcWR68TADaMfsvdJBuq3zNRzpN+z7yD2Hf5YEOi83gMf0D1hdMr66Ieyt8 FH/OEn1HmcIvmpgbB4DNd8YzOQkD1J0Zx5/8+uZpLOpA37nnF6jTTD484IBOzr8fdj xXKBo98uctJQ+DZAlyvhxHHlUxcjz3WEJ+6MABjpLIl7M7KPS+SvDZWtT0oCFPOCfr 2dql30MJ9jYnA8C0uTJMNH9SpfNHB86yKt3QhHTIInIiCWcoA1DxzrLKvYWV/HnA7V /S/haBKjS0znQ== Message-ID: <03247146-0c87-1f3f-87b4-5d0d5620da31@gotplt.org> Date: Mon, 25 Sep 2023 01:21:09 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: [PATCH v3] Fix leak in getaddrinfo introduced by the fix for CVE-2023-4806 [BZ #30843] Content-Language: en-US To: Romain Geissler , libc-alpha@sourceware.org References: <20230925001829.63-1-romain.geissler@amadeus.com> From: Siddhesh Poyarekar In-Reply-To: <20230925001829.63-1-romain.geissler@amadeus.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-3038.0 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,NICE_REPLY_A,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,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: On 2023-09-25 01:18, Romain Geissler wrote: > Changes since v2: > - Format Makefile so that lines do not exceed 79 chars. > - Add a space " " between "mtrace" and "()" in the test, as it seems > it's the coding style used elsewhere in glibc. > > > Fix leak in getaddrinfo introduced by the fix for CVE-2023-4806 [BZ#30843] Reviewed-by: Siddhesh Poyarekar > > --- > 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 e3d21e9a899..6ef5bf23b30 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 d5f10c07d6a..7db53cf09da 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 b4e8ea3880a..69f38bbfb9e 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; > }