commit 70f090e4e803716f0532071128002ce021fa0626
author Treehugger Robot <treehugger-gerrit@google.com> Fri Apr 26 21:15:28 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 26 21:15:28 2019 +0000
tree 14f2a372039ab6a19f5d13559d5d1dafb620e0ae
parent 9f193e14edb6ce80c8cb43045bf90bdab2180716
parent 560de5f5c766b7fc9fad83a3bc0ef2e1441e9b29

Merge changes I59a7c224,I82d28654

* changes:
  Don't honor LIBC_HOOKS_ENABLE across a security boundary
  Don't honor LD_CONFIG_FILE across security transitions

libc/bionic/libc_init_common.cpp

diff --git a/libc/bionic/libc_init_common.cpp b/libc/bionic/libc_init_common.cpp
index b229cda..1f099cf 100644
--- a/libc/bionic/libc_init_common.cpp
+++ b/libc/bionic/libc_init_common.cpp
@@ -232,6 +232,7 @@
     "LD_AOUT_LIBRARY_PATH",
     "LD_AOUT_PRELOAD",
     "LD_AUDIT",
+    "LD_CONFIG_FILE",
     "LD_DEBUG",
     "LD_DEBUG_OUTPUT",
     "LD_DYNAMIC_WEAK",
@@ -242,6 +243,7 @@
     "LD_SHOW_AUXV",
     "LD_USE_LOAD_BIAS",
     "LIBC_DEBUG_MALLOC_OPTIONS",
+    "LIBC_HOOKS_ENABLE",
     "LOCALDOMAIN",
     "LOCPATH",
     "MALLOC_CHECK_",