From: Siddhesh Poyarekar <siddhesh@sourceware.org>
To: libc-stable@sourceware.org
Cc: Arjun Shankar <arjun@redhat.com>
Subject: [committed 2.34 1/5] ldconfig: avoid leak on empty paths in config file
Date: Wed, 4 Aug 2021 15:57:18 +0530 [thread overview]
Message-ID: <20210804102722.3103199-1-siddhesh@sourceware.org> (raw)
Reviewed-by: Arjun Shankar <arjun@redhat.com>
(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] = '\0';
if (i == 0)
- return;
+ {
+ free (entry->path);
+ free (entry);
+ return;
+ }
char *path = entry->path;
if (opt_chroot != NULL)
--
2.31.1
next reply other threads:[~2021-08-04 10:27 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-04 10:27 Siddhesh Poyarekar [this message]
2021-08-04 10:27 ` [committed 2.34 2/5] gconv_parseconfdir: Fix memory leak Siddhesh Poyarekar
2021-08-04 10:27 ` [committed 2.34 3/5] gaiconf_init: Avoid double-free in label and precedence lists Siddhesh Poyarekar
2021-08-04 10:27 ` [committed 2.34 4/5] copy_and_spawn_sgid: Avoid double calls to close() Siddhesh Poyarekar
2021-08-04 10:27 ` [committed 2.34 5/5] iconv_charmap: Close output file when done Siddhesh Poyarekar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210804102722.3103199-1-siddhesh@sourceware.org \
--to=siddhesh@sourceware.org \
--cc=arjun@redhat.com \
--cc=libc-stable@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).