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
25 lines
1.0 KiB
Diff
25 lines
1.0 KiB
Diff
commit 9acab0bba6a5a57323b1f94bf95b21618a9e5aa4
|
|
Author: Arjun Shankar <arjun@redhat.com>
|
|
Date: Fri Aug 20 16:24:05 2021 +0200
|
|
|
|
elf: Fix missing colon in LD_SHOW_AUXV output [BZ #28253]
|
|
|
|
This commit adds a missing colon in the AT_MINSIGSTKSZ entry in
|
|
the _dl_show_auxv function.
|
|
|
|
(cherry picked from commit 82fbcd7118d760492e2ecc9fa291e358b9ba0361)
|
|
|
|
diff --git a/elf/dl-sysdep.c b/elf/dl-sysdep.c
|
|
index d47bef1340ce6f35..2c684c2db2a1f59b 100644
|
|
--- a/elf/dl-sysdep.c
|
|
+++ b/elf/dl-sysdep.c
|
|
@@ -317,7 +317,7 @@ _dl_show_auxv (void)
|
|
[AT_SYSINFO_EHDR - 2] = { "SYSINFO_EHDR: 0x", hex },
|
|
[AT_RANDOM - 2] = { "RANDOM: 0x", hex },
|
|
[AT_HWCAP2 - 2] = { "HWCAP2: 0x", hex },
|
|
- [AT_MINSIGSTKSZ - 2] = { "MINSIGSTKSZ ", dec },
|
|
+ [AT_MINSIGSTKSZ - 2] = { "MINSIGSTKSZ: ", dec },
|
|
[AT_L1I_CACHESIZE - 2] = { "L1I_CACHESIZE: ", dec },
|
|
[AT_L1I_CACHEGEOMETRY - 2] = { "L1I_CACHEGEOMETRY: 0x", hex },
|
|
[AT_L1D_CACHESIZE - 2] = { "L1D_CACHESIZE: ", dec },
|