Reduce value of LD_HWCAP_MASK for tst-env-setuid test case

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.

diff --git a/ChangeLog b/ChangeLog
index f0227d4598c230e5e5cbd8940ca067818eafba64..06ef5789b0bc3aacde09079e757af06a0b3a0178 100644 (file)
--- 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 2fd6bf79d93eced428a20b139d9fd8ed1c377180..201b328f88499d296b1eaf047cef13eb4be81b77 100644 (file)
--- 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