Use RecvMsgWithPid to find real PID for zygote children

components/nacl/loader/nacl_helper_linux.cc

 // Copyright 2013 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.
 
 // A mini-zygote specifically for Native Client.
 
 #include "components/nacl/loader/nacl_helper_linux.h"
 
 #include <errno.h>
 #include <fcntl.h>
@@ skipping 18 matching lines @@
 #include "base/posix/eintr_wrapper.h"
 #include "base/posix/global_descriptors.h"
 #include "base/posix/unix_domain_socket_linux.h"
 #include "base/process/kill.h"
 #include "base/process/process_handle.h"
 #include "base/rand_util.h"
 #include "components/nacl/common/nacl_switches.h"
 #include "components/nacl/loader/nacl_listener.h"
 #include "components/nacl/loader/nonsfi/irt_exception_handling.h"
 #include "components/nacl/loader/sandbox_linux/nacl_sandbox_linux.h"
+#include "content/public/common/child_process_sandbox_support_linux.h"
 #include "content/public/common/content_descriptors.h"
 #include "content/public/common/zygote_fork_delegate_linux.h"
 #include "crypto/nss_util.h"
 #include "ipc/ipc_descriptors.h"
 #include "ipc/ipc_switches.h"
 #include "sandbox/linux/services/libc_urandom_override.h"
 
 namespace {
 
 struct NaClLoaderSystemInfo {
@@ skipping 58 matching lines @@
   listener.Listen();
   _exit(0);
 }
 
 // Start the NaCl loader in a child created by the NaCl loader Zygote.
 void ChildNaClLoaderInit(ScopedVector<base::ScopedFD> child_fds,
                          const NaClLoaderSystemInfo& system_info,
                          bool uses_nonsfi_mode,
                          nacl::NaClSandbox* nacl_sandbox,
                          const std::string& channel_id) {
-  bool validack = false;
-  base::ProcessId real_pid;
-  // Wait until the parent process has discovered our PID.  We
-  // should not fork any child processes (which the seccomp
-  // sandbox does) until then, because that can interfere with the
-  // parent's discovery of our PID.
-  const ssize_t nread = HANDLE_EINTR(
-      read(child_fds[content::ZygoteForkDelegate::kParentFDIndex]->get(),
-           &real_pid,
-           sizeof(real_pid)));
-  if (static_cast<size_t>(nread) == sizeof(real_pid)) {
-    // Make sure the parent didn't accidentally send us our real PID.
-    // We don't want it to be discoverable anywhere in our address space
-    // when we start running untrusted code.
-    CHECK(real_pid == 0);
+  // Ping the PID oracle socket.

[jln (very slow on Chromium), 2014/05/05 23:09:33]

Feel free to add a DCHECK that child_fds.size() is > than
std::max(kPidOracleFDIndex, kBrowserFDndex).

[mdempsky, 2014/05/05 23:16:24]

Done.

+  CHECK(content::SendZygoteChildPing(
+      child_fds[content::ZygoteForkDelegate::kPIDOracleFDIndex]->get()));
 
-    CommandLine::ForCurrentProcess()->AppendSwitchASCII(
-        switches::kProcessChannelID, channel_id);
-    validack = true;
-  } else {
-    if (nread < 0)
-      perror("read");
-    LOG(ERROR) << "read returned " << nread;
-  }
+  CommandLine::ForCurrentProcess()->AppendSwitchASCII(
+      switches::kProcessChannelID, channel_id);
 
+  // Save the browser socket and close the rest.
   base::ScopedFD browser_fd(
       child_fds[content::ZygoteForkDelegate::kBrowserFDIndex]->Pass());
   child_fds.clear();
 
-  if (validack) {
-    BecomeNaClLoader(
-        browser_fd.Pass(), system_info, uses_nonsfi_mode, nacl_sandbox);
-  } else {
-    LOG(ERROR) << "Failed to synch with zygote";
-  }
+  BecomeNaClLoader(
+      browser_fd.Pass(), system_info, uses_nonsfi_mode, nacl_sandbox);
   _exit(1);
 }
 
 // Handle a fork request from the Zygote.
 // Some of this code was lifted from
 // content/browser/zygote_main_linux.cc:ForkWithRealPid()
 bool HandleForkRequest(ScopedVector<base::ScopedFD> child_fds,
                        const NaClLoaderSystemInfo& system_info,
                        nacl::NaClSandbox* nacl_sandbox,
                        PickleIterator* input_iter,
@@ skipping 287 matching lines @@
   // Now handle requests from the Zygote.
   while (true) {
     bool request_handled = HandleZygoteRequest(
         kNaClZygoteDescriptor, system_info, nacl_sandbox.get());
     // Do not turn this into a CHECK() without thinking about robustness
     // against malicious IPC requests.
     DCHECK(request_handled);
   }
   NOTREACHED();
 }