Add validation caching interface.

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/include/portability.h"
 #include "native_client/src/include/portability_io.h"
 
 #if NACL_OSX
@@ skipping 11 matching lines @@
 #include "native_client/src/trusted/gio/gio_nacl_desc.h"
 #include "native_client/src/trusted/service_runtime/include/sys/fcntl.h"
 #include "native_client/src/trusted/service_runtime/nacl_globals.h"
 #include "native_client/src/trusted/service_runtime/env_cleanser.h"
 #include "native_client/src/trusted/service_runtime/nacl_app.h"
 #include "native_client/src/trusted/service_runtime/nacl_all_modules.h"
 #include "native_client/src/trusted/service_runtime/nacl_signal.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_cache.h"
 
 int verbosity = 0;
 
 static int g_irt_file_desc = -1;
 
 
 void NaClSetIrtFileDesc(int fd) {
   CHECK(g_irt_file_desc == -1);
   g_irt_file_desc = fd;
 }
@@ skipping 24 matching lines @@
   if (NaClAppLoadFileDynamically(nap, gio_desc) != LOAD_OK) {
     NaClLog(LOG_FATAL,
             "NaClLoadIrt: Failed to load the integrated runtime (IRT).  "
             "The user executable was probably not built to use the IRT.\n");
   }
 
   (*NACL_VTBL(Gio, gio_desc)->Close)(gio_desc);
   (*NACL_VTBL(Gio, gio_desc)->Dtor)(gio_desc);
 }
 
+static NaClValidationCache *g_validation_cache = NULL;

[Mark Seaborn, 2012/03/01 00:26:20]

Move this to the global vars block at the top

[Nick Bray (chromium), 2012/03/01 01:25:16]

Done.

+
+/* TODO(ncbray) consolidate Chrome's sel_ldr setup to a single function. */

[Mark Seaborn, 2012/03/01 00:26:20]

NaClSetIrtFileDesc() is in sel_ldr.h so this should be, too.

+void NaClSetValidationCache(NaClValidationCache *cache) {
+  g_validation_cache = cache;
+}
+
 void NaClMainForChromium(int handle_count, const NaClHandle *handles,
                          int debug) {
   char *av[1];
   int ac = 1;
   const char **envp;
   struct NaClApp state;
   int export_addr_to = (int) handles[0]; /* Used to be set by -X. */
   struct NaClApp *nap = &state;
   NaClErrorCode errcode = LOAD_INTERNAL;
   int ret_code = 1;
@@ skipping 15 matching lines @@
   /* to be passed to NaClMain, eventually... */
   av[0] = "NaClMain";
 
   if (!NaClAppCtor(&state)) {
     fprintf(stderr, "Error while constructing app state\n");
     goto done_ctor;
   }
 
   errcode = LOAD_OK;
 
+  /* Inject the validation caching interface, if it exists. */
+  nap->validation_cache = g_validation_cache;
+
   NaClAppInitialDescriptorHookup(nap);
 
   /*
    * NACL_SERVICE_PORT_DESCRIPTOR and NACL_SERVICE_ADDRESS_DESCRIPTOR
    * are 3 and 4.
    */
 
   /* import IMC handle - used to be "-i" */
   CHECK(handle_count == 1);
   NaClAddImcHandle(nap, handles[0], export_addr_to);
@@ skipping 169 matching lines @@
   if (LOAD_OK != errcode) {
     NaClBlockIfCommandChannelExists(nap);
   }
 
  done_ctor:
 
   NaClAllModulesFini();
 
   NaClExit(ret_code);
 }