Provide metadata to validator to allow faster caching.

src/trusted/service_runtime/nacl_text.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 <string.h>
 
 #include "native_client/src/include/concurrency_ops.h"
 #include "native_client/src/include/nacl_platform.h"
@@ skipping 606 matching lines @@
   shm_map_size = shm_map_offset_end - shm_map_offset;
   if (shm_map_size > NACL_MAP_PAGESIZE) {
     /* call with size==offset==0 to clear cache */
     CachedMapWritableText(nap, 0, 0);
   }
 }
 
 int32_t NaClTextDyncodeCreate(struct NaClApp *nap,
                               uint32_t       dest,
                               void           *code_copy,
-                              uint32_t       size) {
+                              uint32_t       size,
+                              const struct NaClValidationMetadata *metadata) {
   uintptr_t                   dest_addr;
   uint8_t                     *mapped_addr;
   int32_t                     retval = -NACL_ABI_EINVAL;
   int                         validator_result;
   struct NaClPerfCounter      time_dyncode_create;
   NaClPerfCounterCtor(&time_dyncode_create, "NaClTextDyncodeCreate");
 
   if (NULL == nap->text_shm) {
     NaClLog(1, "NaClTextDyncodeCreate: Dynamic loading not enabled\n");
     return -NACL_ABI_EINVAL;
@@ skipping 26 matching lines @@
   }
 
   NaClXMutexLock(&nap->dynamic_load_mutex);
 
   /*
    * Validate the code before trying to create the region.  This avoids the need
    * to delete the region if validation fails.
    * See: http://code.google.com/p/nativeclient/issues/detail?id=2566
    */
   if (!nap->skip_validator) {
-    validator_result = NaClValidateCode(nap, dest, code_copy, size);
+    validator_result = NaClValidateCode(nap, dest, code_copy, size, metadata);
   } else {
     NaClLog(LOG_ERROR, "VALIDATION SKIPPED.\n");
     validator_result = LOAD_OK;
   }
 
   NaClPerfCounterMark(&time_dyncode_create,
                       NACL_PERF_IMPORTANT_PREFIX "DynRegionValidate");
   NaClPerfCounterIntervalLast(&time_dyncode_create);
 
   if (validator_result != LOAD_OK
@@ skipping 59 matching lines @@
   /*
    * Make a private copy of the code, so that we can validate it
    * without a TOCTTOU race condition.
    */
   code_copy = malloc(size);
   if (NULL == code_copy) {
     return -NACL_ABI_ENOMEM;
   }
   memcpy(code_copy, (uint8_t*) src_addr, size);
 
-  retval = NaClTextDyncodeCreate(nap, dest, code_copy, size);
+  /* Unknown data source, no metadata. */
+  retval = NaClTextDyncodeCreate(nap, dest, code_copy, size, NULL);
 
   free(code_copy);
   return retval;
 }
 
 int32_t NaClSysDyncodeModify(struct NaClAppThread *natp,
                              uint32_t             dest,
                              uint32_t             src,
                              uint32_t             size) {
   struct NaClApp              *nap = natp->nap;
@@ skipping 208 matching lines @@
     /*
      * Still waiting for some threads to report in...
      */
     retval = -NACL_ABI_EAGAIN;
   }
 
  cleanup_unlock:
   NaClXMutexUnlock(&nap->dynamic_load_mutex);
   return retval;
 }