New NaCl zygote implementation 2

chrome/nacl/nacl_helper_linux.cc

Index: chrome/nacl/nacl_helper_linux.cc
diff --git a/chrome/nacl/nacl_helper_linux.cc b/chrome/nacl/nacl_helper_linux.cc
new file mode 100644
index 0000000000000000000000000000000000000000..5ee6c387b595f90c30d97d82dcfa76fc91ca2103
--- /dev/null
+++ b/chrome/nacl/nacl_helper_linux.cc
@@ -0,0 +1,163 @@
+// Copyright (c) 2011 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 <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+
+#include <vector>
+
+#include "base/at_exit.h"
+#include "base/command_line.h"
+#include "base/eintr_wrapper.h"
+#include "base/logging.h"
+#include "base/message_loop.h"
+#include "base/rand_util.h"
+#include "ipc/ipc_channel.h"
+#include "chrome/common/nacl_helper_linux.h"
+#include "chrome/nacl/nacl_listener.h"
+#include "content/common/main_function_params.h"
+#include "content/common/unix_domain_socket_posix.h"
+
+#if defined(NDEBUG)
+#define DEBUG(s) do { if (0) { s; } } while (0)

[jam, 2011/06/21 20:54:08]

you already use stuff from base, why can't you use DCHECK?

[Brad Chen, 2011/06/21 23:43:48]

Done.

On 2011/06/21 20:54:08, John Abd-El-Malek wrote:

+#else
+#define DEBUG(s) s
+#endif
+
+static bool g_suid_sandbox_active;
+
+// The child must mimic the behavior of zygote_main_linux.cc on the child
+// side of the fork. See zygote_main_linux.cc:HandleForkRequest from
+//   if (!child) {
+// Note: this code doesn't attempt to support SELINUX or the SECCOMP sandbox.
+static void BecomeNaClLoader(const std::vector<int>& child_fds) {
+  DEBUG(fprintf(stderr, "NaCl loader: setting up IPC descriptor\n"));
+  close(kNaClZygoteDescriptor); // don't need this any more
+  // Set up browser descriptor as expected by Chrome on fd 3
+  // The zygote takes care of putting the sandbox IPC channel on fd 5
+  int zfd = dup2(child_fds[kNaClBrowserFDIndex], kNaClBrowserDescriptor);
+  if (zfd != kNaClBrowserDescriptor) {
+    fprintf(stderr, "Could not initialize kNaClBrowserDescriptor (%d)\n", zfd);
+    _exit(-1);
+  }
+
+  MessageLoopForIO main_message_loop;
+  NaClListener listener;
+  IPC::Channel chan(kNaClListenerHandle, IPC::Channel::MODE_CLIENT, &listener);
+  CHECK(chan.Connect());
+#if 0

[jam, 2011/06/21 20:54:08]

not needed anymore right?

[Brad Chen, 2011/06/21 23:43:48]

Done.

+  // This code is useful for testing NaClLauncherThread. Using
+  // NaClLauncherThread instead of NaClListener increases the
+  // helper release binary size by about 14MB.
+  ChildProcess nacl_process;
+  nacl_process.set_main_thread(new NaClLauncherThread(false));
+#endif
+  MessageLoop::current()->Run();
+  _exit(0);
+}
+
+// Some of this code was lifted from
+// content/browser/zygote_main_linux.cc:ForkWithRealPid()
+static void HandleForkRequest(const std::vector<int>& child_fds) {
+  DEBUG(fprintf(stderr, "nacl_helper: forking\n"));
+  pid_t childpid = fork();
+  if (childpid < 0) {
+    perror("fork");
+    fprintf(stderr, "*** HandleForkRequest failed\n");

[jam, 2011/06/21 20:54:08]

nit: please use chrome logging instead of printfs

[Brad Chen, 2011/06/21 23:43:48]

Done.

+    // fall through to parent case below
+  } else if (childpid == 0) {  // In the child process.
+    if (g_suid_sandbox_active) {
+      char buffer[1];
+      // 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.
+      int nread = HANDLE_EINTR(read(child_fds[kNaClParentFDIndex], buffer, 1));
+      if (nread != 1 || buffer[0] != 'x') {
+        if (nread < 0) {
+          perror("read");
+        }
+        fprintf(stderr, "Failed to synch with zygote (%d:%d)\n",
+                nread, buffer[0]);
+      } else {
+        DEBUG(fprintf(stderr,
+                      "NaCl loader is synchronised with Chrome zygote\n"));
+      }
+    }
+    close(child_fds[kNaClDummyFDIndex]);
+    close(child_fds[kNaClParentFDIndex]);
+    BecomeNaClLoader(child_fds);
+    // NOTREACHED
+    return;
+  }
+  // I am the parent.
+  // First, close the dummy_fd so the sandbox won't find me when
+  // looking for the child's pid in /proc. Also close other fds.
+  for (size_t i = 0; i < child_fds.size(); i++) {
+    close(child_fds[i]);
+  }
+  DEBUG(fprintf(stderr, "nacl_helper: childpid is %d\n", childpid));
+  // Now tell childpid to the Chrome zygote.
+  if (HANDLE_EINTR(send(kNaClZygoteDescriptor,
+                        &childpid, sizeof(childpid), MSG_EOR))
+      != sizeof(childpid)) {
+    fprintf(stderr, "*** send() to zygote failed");
+  }
+}
+
+int main(int argc, char *argv[]) {
+  CommandLine::Init(argc, argv);
+  base::AtExitManager exit_manager;
+  base::RandUint64();  // acquire /dev/urandom fd before sandbox is raised
+  std::vector<int> empty; // for SendMsg() calls
+
+  g_suid_sandbox_active = (NULL != getenv("SBX_D"));
+
+  // Send the zygote a message to let it know we are ready to help
+  if (!UnixDomainSocket::SendMsg(kNaClZygoteDescriptor,
+                                 kNaClHelperStartupAck,
+                                 sizeof(kNaClHelperStartupAck), empty)) {
+    fprintf(stderr, "*** send() to zygote failed");
+  }
+
+  while (true) {
+    int badpid = -1;
+    std::vector<int> fds;
+    static const unsigned kMaxMessageLength = 2048;
+    char buf[kMaxMessageLength];
+    const ssize_t msglen = UnixDomainSocket::RecvMsg(kNaClZygoteDescriptor,
+                                                     &buf, sizeof(buf), &fds);
+    if (msglen == 0 || (msglen == -1 && errno == ECONNRESET)) {
+      // EOF from the browser. Goodbye!
+      _exit(0);
+    }
+    if (msglen == sizeof(kNaClForkRequest) &&
+        memcmp(buf, kNaClForkRequest, msglen) == 0) {
+      if (kNaClBrowserFDIndex + 1 == fds.size() ||
+          kNaClParentFDIndex + 1 == fds.size()) {
+        HandleForkRequest(fds);
+        continue;  // fork succeeded. Note: child does not return
+      } else {
+        fprintf(stderr, "nacl_helper: unexpected number of fds, got %d\n",
+                int(fds.size()));
+      }
+    } else {
+      if (msglen != 0) {
+        fprintf(stderr, "nacl_helper unrecognized request: %s:%d\n",
+                buf, msglen);
+        _exit(-1);
+      }
+    }
+    // if fork fails, send PID=-1 to zygote
+    if (!UnixDomainSocket::SendMsg(kNaClZygoteDescriptor, &badpid,
+                                   sizeof(badpid), empty)) {
+      fprintf(stderr, "*** send() to zygote failed");
+    }
+  }
+}