Expose NaClAppSetDesc() to Chromium for use at startup

src/trusted/service_runtime/sel_main_chrome.c

 /*
  * Copyright (c) 2012 The Native Client Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "native_client/src/trusted/service_runtime/sel_main_chrome.h"
 
 #include "native_client/src/include/portability.h"
 #include "native_client/src/include/portability_io.h"
 #include "native_client/src/include/portability_sockets.h"
 
 #if NACL_OSX
 #include <crt_externs.h>
 #endif
 
 #include <stdio.h>
 #include <string.h>
 
 #include "native_client/src/include/nacl_macros.h"
+#include "native_client/src/public/nacl_app.h"
 #include "native_client/src/shared/platform/nacl_check.h"
 #include "native_client/src/shared/platform/nacl_exit.h"
 #include "native_client/src/shared/platform/nacl_log.h"
 #include "native_client/src/shared/platform/nacl_secure_random.h"
 #include "native_client/src/shared/platform/nacl_sync.h"
 #include "native_client/src/shared/platform/nacl_sync_checked.h"
 #include "native_client/src/trusted/desc/nacl_desc_io.h"
 #include "native_client/src/trusted/fault_injection/fault_injection.h"
 #include "native_client/src/trusted/gio/gio_nacl_desc.h"
 #include "native_client/src/trusted/service_runtime/env_cleanser.h"
 #include "native_client/src/trusted/service_runtime/include/sys/fcntl.h"
 #include "native_client/src/trusted/service_runtime/nacl_all_modules.h"
 #include "native_client/src/trusted/service_runtime/nacl_app.h"
 #include "native_client/src/trusted/service_runtime/nacl_bootstrap_channel_error_reporter.h"
 #include "native_client/src/trusted/service_runtime/nacl_error_log_hook.h"
 #include "native_client/src/trusted/service_runtime/nacl_globals.h"
 #include "native_client/src/trusted/service_runtime/nacl_debug_init.h"
 #include "native_client/src/trusted/service_runtime/nacl_signal.h"
 #include "native_client/src/trusted/service_runtime/osx/mach_exception_handler.h"
 #include "native_client/src/trusted/service_runtime/sel_addrspace.h"
 #include "native_client/src/trusted/service_runtime/sel_ldr.h"
 #include "native_client/src/trusted/service_runtime/sel_qualify.h"
 #include "native_client/src/trusted/service_runtime/win/exception_patch/ntdll_patch.h"
 #include "native_client/src/trusted/validator/validation_metadata.h"
 
+static int g_initialized = 0;
+
+#if NACL_LINUX || NACL_OSX
+void NaClChromeMainSetUrandomFd(int urandom_fd) {
+  NaClSecureRngModuleSetUrandomFd(urandom_fd);
+}
+#endif
+
+void NaClChromeMainInit(void) {
+  CHECK(!g_initialized);
+  NaClAllModulesInit();
+  g_initialized = 1;
+}
+
 struct NaClChromeMainArgs *NaClChromeMainArgsCreate(void) {
   struct NaClChromeMainArgs *args = malloc(sizeof(*args));
   if (args == NULL)
     return NULL;
   args->imc_bootstrap_handle = NACL_INVALID_HANDLE;
   args->irt_fd = -1;
   args->initial_ipc_desc = NULL;
   args->enable_exception_handling = 0;
   args->enable_debug_stub = 0;
   args->enable_dyncode_syscalls = 1;
@@ skipping 10 matching lines @@
 #if NACL_LINUX || NACL_OSX
   args->urandom_fd = -1;
   args->number_of_cores = -1;  /* unknown */
 #endif
 #if NACL_LINUX
   args->prereserved_sandbox_size = 0;
 #endif
 
   /*
    * Initialize NaClLog so that Chromium can call
-   * NaClDescMakeCustomDesc() between calling
-   * NaClChromeMainArgsCreate() and NaClChromeMainStart().
+   * NaClDescMakeCustomDesc(), before NaClAllModulesInit() gets
+   * called.
+   *
+   * TODO(mseaborn): Remove this once Chromium calls
+   * NaClChromeMainInit() before NaClChromeMainArgsCreate().
    */
   NaClLogModuleInit();
 
   return args;
 }
 
 static char kFakeIrtName[] = "\0IRT";
 
 static void NaClLoadIrt(struct NaClApp *nap, int irt_fd) {
   int file_desc;
@@ skipping 29 matching lines @@
   if (errcode != LOAD_OK) {
     NaClLog(LOG_FATAL,
             "NaClLoadIrt: Failed to load the integrated runtime (IRT): %s\n",
             NaClErrorString(errcode));
   }
 
   NaClMetadataDtor(&metadata);
   NaClDescUnref(nd);
 }
 
-void NaClChromeMainStart(struct NaClChromeMainArgs *args) {
+void NaClChromeMainStartApp(struct NaClApp *nap,
+                            struct NaClChromeMainArgs *args) {
   char *av[1];
   int ac = 1;
   const char **envp;
-  struct NaClApp state;
-  struct NaClApp *nap = &state;
   NaClErrorCode errcode = LOAD_INTERNAL;
   int ret_code = 1;
   struct NaClEnvCleanser env_cleanser;
   int skip_qualification;
 
 #if NACL_OSX
   /* Mac dynamic libraries cannot access the environ variable directly. */
   envp = (const char **) *_NSGetEnviron();
 #else
   /* Overzealous code style check is overzealous. */
   /* @IGNORE_LINES_FOR_CODE_HYGIENE[1] */
   extern char **environ;
   envp = (const char **) environ;
 #endif
 
 #if NACL_LINUX || NACL_OSX
   /* This needs to happen before NaClAllModulesInit(). */
   if (args->urandom_fd != -1)
     NaClSecureRngModuleSetUrandomFd(args->urandom_fd);
 #endif
+  /* TODO(mseaborn): Remove this when NaClChromeMainStart() is removed. */
+  if (nap == NULL) {
+    NaClChromeMainInit();
+    nap = NaClAppCreate();
+  }
 
-  /*
-   * Clear state so that NaClBootstrapChannelErrorReporter will be
-   * able to know if the bootstrap channel is available or not.
-   */
-  memset(&state, 0, sizeof state);
-  NaClAllModulesInit();
   NaClBootstrapChannelErrorReporterInit();
-  NaClErrorLogHookInit(NaClBootstrapChannelErrorReporter, &state);
+  NaClErrorLogHookInit(NaClBootstrapChannelErrorReporter, nap);
 
   /* to be passed to NaClMain, eventually... */
   av[0] = "NaClMain";
 
-  if (NACL_FI_ERROR_COND("AppCtor", !NaClAppCtor(&state))) {
-    NaClLog(LOG_FATAL, "Error while constructing app state\n");
-    goto done;
-  }
-
   errcode = LOAD_OK;
 
   /* Allow or disallow dyncode API based on args. */
   nap->enable_dyncode_syscalls = args->enable_dyncode_syscalls;
   nap->initial_nexe_max_code_bytes = args->initial_nexe_max_code_bytes;
 
 #if NACL_LINUX
   g_prereserved_sandbox_size = args->prereserved_sandbox_size;
 #endif
 #if NACL_LINUX || NACL_OSX
@@ skipping 81 matching lines @@
         args->attach_debug_exception_handler_func;
 #else
 # error Unknown host OS
 #endif
   }
 #if NACL_LINUX
   NaClSignalHandlerInit();
 #endif
 
   /* Give debuggers a well known point at which xlate_base is known.  */
-  NaClGdbHook(&state);
+  NaClGdbHook(nap);
 
   NaClCreateServiceSocket(nap);
   /*
    * LOG_FATAL errors that occur before NaClSetUpBootstrapChannel will
    * not be reported via the crash log mechanism (for Chromium
    * embedding of NaCl, shown in the JavaScript console).
    *
    * Some errors, such as due to NaClRunSelQualificationTests, do not
    * trigger a LOG_FATAL but instead set module_load_status to be sent
    * in the start_module RPC reply.  Log messages associated with such
@@ skipping 116 matching lines @@
    * Instead, we wait for the hard-shutdown on the command channel.
    */
   if (LOAD_OK != errcode) {
     NaClBlockIfCommandChannelExists(nap);
   }
 
   NaClAllModulesFini();
 
   NaClExit(ret_code);
 }
+
+void NaClChromeMainStart(struct NaClChromeMainArgs *args) {
+  NaClChromeMainStartApp(NULL, args);
+}