For b/4268901, disable "/etc/ld.so.preload".

diff --git a/README.google b/README.google
index 8cd55809ec9a95f8db4347428802e799a75bded7..c13b1ab510e163e02eb101c027c796a3940afdd1 100644 (file)
--- a/README.google
+++ b/README.google
@@ -132,3 +132,9 @@ sysdeps/unix/grantpt.c
   Forward-ported from cl/51332316 (from cl/41538-p2).
   (ppluzhnikov, google-local)
 
+elf/rtld.c
+  For b/4268901, disable "/etc/ld.so.preload", but allow other builds to
+  re-enable it by setting -DENABLE_ETC_LD_SO_PRELOAD in CFLAGS.
+  Forward-ported from cl/51332859 (from cl/51576-p2 and cl/51620-p2).
+  (ppluzhnikov, google-local)
+

diff --git a/elf/rtld.c b/elf/rtld.c
index 6dcbabc2847b04ca1a313301cad4831cf4d46d95..55299c338668a6c86060e0ef2506f009ded1430e 100644 (file)
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -1636,6 +1636,10 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
       HP_TIMING_ACCUM_NT (load_time, diff);
     }
 
+
+#if ENABLE_ETC_LD_SO_PRELOAD  /* Google-local: we don't want
+                                /etc/ld.so.preload for GRTE.  */
+
   /* There usually is no ld.so.preload file, it should only be used
      for emergencies and testing.  So the open call etc should usually
      fail.  Using access() on a non-existing file is faster than using
@@ -1720,6 +1724,8 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
        }
     }
 
+#endif  /* end "/etc/ld.so.preload" disable.  */
+
   if (__builtin_expect (*first_preload != NULL, 0))
     {
       /* Set up PRELOADS with a vector of the preloaded libraries.  */