From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2206) id 8F3E538515DD; Wed, 4 Aug 2021 10:27:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8F3E538515DD Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Siddhesh Poyarekar To: glibc-cvs@sourceware.org Subject: [glibc/release/2.34/master] ldconfig: avoid leak on empty paths in config file X-Act-Checkin: glibc X-Git-Author: Siddhesh Poyarekar X-Git-Refname: refs/heads/release/2.34/master X-Git-Oldrev: ae37d06c7d127817ba43850f0f898b793d42aea7 X-Git-Newrev: 0b03996304f86d6dba8f0d4b7048b9bb7186f17d Message-Id: <20210804102707.8F3E538515DD@sourceware.org> Date: Wed, 4 Aug 2021 10:27:07 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Aug 2021 10:27:07 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=0b03996304f86d6dba8f0d4b7048b9bb7186f17d commit 0b03996304f86d6dba8f0d4b7048b9bb7186f17d Author: Siddhesh Poyarekar Date: Tue Aug 3 21:10:10 2021 +0530 ldconfig: avoid leak on empty paths in config file Reviewed-by: Arjun Shankar (cherry picked from commit b0234d79e7d82475d1666f25326ec045c045b3ed) Diff: --- 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] = '\0'; if (i == 0) - return; + { + free (entry->path); + free (entry); + return; + } char *path = entry->path; if (opt_chroot != NULL)