Or bit_Prefer_MAP_32BIT_EXEC in EXTRA_LD_ENVVARS

We should turn on bit_Prefer_MAP_32BIT_EXEC in EXTRA_LD_ENVVARS without
overriding other bits.

	[BZ #19758]
	* sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h
	(EXTRA_LD_ENVVARS): Or bit_Prefer_MAP_32BIT_EXEC.

diff --git a/ChangeLog b/ChangeLog
index a539098b50c1aac2ed4e7c796ceb59a1ee79d93b..4abbd3b5dced2e8ac887ec3daeb2e4e66990fcd0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-03-11  H.J. Lu  <hongjiu.lu@intel.com>
+
+       [BZ #19758]
+       * sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h
+       (EXTRA_LD_ENVVARS): Or bit_Prefer_MAP_32BIT_EXEC.
+
 2016-03-11  H.J. Lu  <hongjiu.lu@intel.com>
 
        [BZ #19759]

diff --git a/NEWS b/NEWS
index 663c716ff13692192b62e032f82b98e34c811bf1..228a481aef7234fb5b7d64d0ca295843411d26c6 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,7 @@ Security related changes:
 The following bugs are resolved with this release:
 
   [19679] gcc-4.9.3 C++ exception handling broken due to unaligned stack
+  [19758] Or bit_Prefer_MAP_32BIT_EXEC in EXTRA_LD_ENVVARS
   [19759] Don't inline mempcpy for x86
   [19762] Use HAS_ARCH_FEATURE with Fast_Rep_String
   [19792] MIPS: backtrace yields infinite backtrace with makecontext

diff --git a/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h b/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h
index c9db5ea7777acb2bc62b47fcb73a7150799f5280..a759934fdd91287715cb9c12e91914065ea44735 100644 (file)
--- a/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h
+++ b/sysdeps/unix/sysv/linux/x86_64/64/dl-librecon.h
@@ -33,7 +33,7 @@
   case 21:                                                           \
     if (memcmp (envline, "PREFER_MAP_32BIT_EXEC", 21) == 0)          \
       GLRO(dl_x86_cpu_features).feature[index_Prefer_MAP_32BIT_EXEC]  \
-       = bit_Prefer_MAP_32BIT_EXEC;                                  \
+       |= bit_Prefer_MAP_32BIT_EXEC;                                 \
     break;
 
 /* Extra unsecure variables.  The names are all stuffed in a single