commit 9ff1ffd805b57160079f42d7eea051c63e0e2bca
author Elliott Hughes <enh@google.com> Thu Apr 25 22:31:13 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 25 22:31:14 2013 +0000
tree 16dbe01623d1f7b568e813f2c68d80fcb5793c9a
parent 5f28fde8aeee047a70e344c9da937695dc51a3ba
parent e7aaad8b832bdff3b88aa62b5c7597e5fd3db520

Merge "Improve diagnostics in the face of bad tzdata."

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 47c45eb..3ce75f1 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -1595,11 +1595,6 @@
         return false;
     }
 
-    // If this is a setuid/setgid program, close the security hole described in
-    // ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-02:23.stdio.asc
-    if (get_AT_SECURE()) {
-        nullify_closed_stdio();
-    }
     notify_gdb_of_load(si);
     return true;
 }
@@ -1628,6 +1623,12 @@
     // Initialize environment functions, and get to the ELF aux vectors table.
     linker_env_init(args);
 
+    // If this is a setuid/setgid program, close the security hole described in
+    // ftp://ftp.freebsd.org/pub/FreeBSD/CERT/advisories/FreeBSD-SA-02:23.stdio.asc
+    if (get_AT_SECURE()) {
+        nullify_closed_stdio();
+    }
+
     debuggerd_init();
 
     // Get a few environment variables.