diff mbox

[COMMITTED] Reduce value of LD_HWCAP_MASK for tst-env-setuid test case

Message ID 1495138899-5509-1-git-send-email-siddhesh@sourceware.org
State New
Headers show

Commit Message

Siddhesh Poyarekar May 18, 2017, 8:21 p.m. UTC 
It was discovered that the dynamic linker allocates a massive amount
of memory that increases with the value of LD_HWCAP_MASK.  Due to
this, setting its value to 0xffffffff in the environment of
tst-env-setuid would cause it to fail in some environments where
overcommit was disabled or severely constrained because malloc would
fail.

Since this test is only concerned with the value of LD_HWCAP_MASK
envvar being conserved (or not, for setxid binaries), lower its value
to avoid spurious failures.

The allocation bug is reported as #21502.

Siddhesh
---
 ChangeLog    | 5 +++++
 elf/Makefile | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)
diff mbox

Patch

diff --git a/ChangeLog b/ChangeLog
index f0227d4..06ef578 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@ 
+2017-05-18  Siddhesh Poyarekar  <siddhesh@sourceware.org>
+
+	* elf/Makefile (tst-env-setuid-ENV): Reduce value of
+	LD_HWCAP_MASK.
+
 2017-05-18  Rical Jasan  <ricaljasan@pacific.net>
 
 	* manual/conf.texi: Convert @tables of annotated @items to
diff --git a/elf/Makefile b/elf/Makefile
index 2fd6bf7..201b328 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -1407,6 +1407,6 @@  $(objpfx)tst-nodelete-dlclose.out: $(objpfx)tst-nodelete-dlclose-dso.so \
 				   $(objpfx)tst-nodelete-dlclose-plugin.so
 
 tst-env-setuid-ENV = MALLOC_CHECK_=2 MALLOC_MMAP_THRESHOLD_=4096 \
-		     LD_HWCAP_MASK=0xffffffff
+		     LD_HWCAP_MASK=0x1
 tst-env-setuid-tunables-ENV = \
 	GLIBC_TUNABLES=glibc.malloc.check=2:glibc.malloc.mmap_threshold=4096