330b961e66
Upstream commit: 4ed990e5b97a61f29f929bdeb36c5b2abb547a64 - Add MADV_POPULATE_READ and MADV_POPULATE_WRITE from Linux 5.14 to bits/mman-linux.h - Update kernel version to 5.14 in tst-mman-consts.py - Update syscall lists for Linux 5.14 - Use Linux 5.14 in build-many-glibcs.py - Fix failing nss/tst-nss-files-hosts-long with local resolver - iconvconfig: Fix behaviour with --prefix [BZ #28199] - nptl: Fix race between pthread_kill and thread exit (swbz#12889, #1994068) - nptl: pthread_kill, pthread_cancel should not fail after exit (swbz#19193, #1994068) - support: Add support_wait_for_thread_exit - MIPS: Setup errno for {f,l,}xstat - x86-64: Use testl to check __x86_string_control - elf: Fix missing colon in LD_SHOW_AUXV output (swbz#28253, #1995648) - librt: add test (swbz#28213, #1994264) - CVE-2021-38604: fix NULL pointer dereference in mq_notify (swbz#28213, #1994264) - Linux: Fix fcntl, ioctl, prctl redirects for _TIME_BITS=64 (bug 28182) - iconv_charmap: Close output file when done - copy_and_spawn_sgid: Avoid double calls to close() - gaiconf_init: Avoid double-free in label and precedence lists - gconv_parseconfdir: Fix memory leak - ldconfig: avoid leak on empty paths in config file
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
commit 3a48da47a91ccc6f5de260574809e7a44551b876
|
|
Author: Siddhesh Poyarekar <siddhesh@sourceware.org>
|
|
Date: Tue Aug 3 21:10:20 2021 +0530
|
|
|
|
gconv_parseconfdir: Fix memory leak
|
|
|
|
The allocated `conf` would leak if we have to skip over the file due
|
|
to the underlying filesystem not supporting dt_type.
|
|
|
|
Reviewed-by: Arjun Shankar <arjun@redhat.com>
|
|
(cherry picked from commit 5f9b78fe35d08739b6da1e5b356786d41116c108)
|
|
|
|
diff --git a/iconv/gconv_parseconfdir.h b/iconv/gconv_parseconfdir.h
|
|
index a4153e54c6d43797..2f062689ecc72749 100644
|
|
--- a/iconv/gconv_parseconfdir.h
|
|
+++ b/iconv/gconv_parseconfdir.h
|
|
@@ -153,12 +153,11 @@ gconv_parseconfdir (const char *dir, size_t dir_len)
|
|
struct stat64 st;
|
|
if (asprintf (&conf, "%s/%s", buf, ent->d_name) < 0)
|
|
continue;
|
|
- if (ent->d_type == DT_UNKNOWN
|
|
- && (lstat64 (conf, &st) == -1
|
|
- || !S_ISREG (st.st_mode)))
|
|
- continue;
|
|
|
|
- found |= read_conf_file (conf, dir, dir_len);
|
|
+ if (ent->d_type != DT_UNKNOWN
|
|
+ || (lstat64 (conf, &st) != -1 && S_ISREG (st.st_mode)))
|
|
+ found |= read_conf_file (conf, dir, dir_len);
|
|
+
|
|
free (conf);
|
|
}
|
|
}
|