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 6B94738515DD for ; Wed, 4 Aug 2021 10:27:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6B94738515DD 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 37C1E401CC2; Wed, 4 Aug 2021 10:27:34 +0000 (UTC) Received: from pdx1-sub0-mail-a4.g.dreamhost.com (100-98-55-223.trex.outbound.svc.cluster.local [100.98.55.223]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id CD8AE401FE5; Wed, 4 Aug 2021 10:27:33 +0000 (UTC) X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from pdx1-sub0-mail-a4.g.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384) by 100.98.55.223 (trex/6.3.3); Wed, 04 Aug 2021 10:27:34 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Tasty-Sponge: 73d2f966371185e0_1628072854064_771128284 X-MC-Loop-Signature: 1628072854064:2432282469 X-MC-Ingress-Time: 1628072854064 Received: from pdx1-sub0-mail-a4.g.dreamhost.com (localhost [127.0.0.1]) by pdx1-sub0-mail-a4.g.dreamhost.com (Postfix) with ESMTP id 915D38AAB6; Wed, 4 Aug 2021 03:27:33 -0700 (PDT) Received: from rhbox.redhat.com (unknown [1.186.101.110]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: siddhesh@gotplt.org) by pdx1-sub0-mail-a4.g.dreamhost.com (Postfix) with ESMTPSA id 8514C8AA7D; Wed, 4 Aug 2021 03:27:30 -0700 (PDT) X-DH-BACKEND: pdx1-sub0-mail-a4 From: Siddhesh Poyarekar To: libc-stable@sourceware.org Cc: Arjun Shankar Subject: [committed 2.34 1/5] ldconfig: avoid leak on empty paths in config file Date: Wed, 4 Aug 2021 15:57:18 +0530 Message-Id: <20210804102722.3103199-1-siddhesh@sourceware.org> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-3494.0 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_H2, SPF_HELO_NONE, SPF_NEUTRAL, TXREP 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-stable@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-stable mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Aug 2021 10:27:36 -0000 Reviewed-by: Arjun Shankar (cherry picked from commit b0234d79e7d82475d1666f25326ec045c045b3ed) --- elf/ldconfig.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/elf/ldconfig.c b/elf/ldconfig.c index 1037e8d0cf..b8893637f8 100644 --- a/elf/ldconfig.c +++ b/elf/ldconfig.c @@ -503,7 +503,11 @@ add_dir_1 (const char *line, const char *from_file, = int from_line) entry->path[--i] =3D '\0'; =20 if (i =3D=3D 0) - return; + { + free (entry->path); + free (entry); + return; + } =20 char *path =3D entry->path; if (opt_chroot !=3D NULL) --=20 2.31.1