Merge 20733 - Linux: propagate LD_LIBRARY_PATH through the SUID sandbox....

sandbox/linux/suid/sandbox.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // http://code.google.com/p/chromium/wiki/LinuxSUIDSandbox
 
 #include <asm/unistd.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <sched.h>
@@ skipping 200 matching lines @@
   }
 
   if (setresuid(ruid, ruid, ruid)) {
     perror("setresuid");
     return false;
   }
 
   return true;
 }
 
+static bool SetupChildEnvironment() {
+  // ld.so will have cleared LD_LIBRARY_PATH because we are SUID. However, the
+  // child process might need this so zygote_host_linux.cc saved a copy in
+  // SANDBOX_LD_LIBRARY_PATH.
+  const char* sandbox_ld_library_path = getenv("SANDBOX_LD_LIBRARY_PATH");
+  if (sandbox_ld_library_path) {
+    setenv("LD_LIBRARY_PATH", sandbox_ld_library_path, 1 /* overwrite */);
+    unsetenv("SANDBOX_LD_LIBRARY_PATH");
+  }
+
+  return true;
+}
+
 int main(int argc, char **argv) {
   if (argc == 1) {
     fprintf(stderr, "Usage: %s <renderer process> <args...>\n", argv[0]);
     return 1;
   }
 
   if (strcmp(argv[1], kChromeBinary)) {
     fprintf(stderr, "This wrapper can only run %s!\n", kChromeBinary);
     return 1;
   }
 
   if (!MoveToNewPIDNamespace())
     return 1;
   if (!SpawnChrootHelper())
     return 1;
   if (!DropRoot())
     return 1;
+  if (!SetupChildEnvironment())
+    return 1;
 
   execv(argv[1], &argv[1]);
   FatalError("execv failed");
 
   return 1;
 }