Eliminate bundle_size parameter from validator interface.

src/trusted/service_runtime/sel_validate_image.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/shared/platform/nacl_log.h"
 #include "native_client/src/trusted/service_runtime/sel_ldr.h"
 #include "native_client/src/trusted/validator/ncvalidate.h"
 
@@ skipping 54 matching lines @@
     /* Validation caching is currently incompatible with stubout. */
     cache = NULL;
     /* In stub out mode, we do two passes.  The second pass acts as a
        sanity check that bad instructions were indeed overwritten with
        allowable HLTs. */
     status = NACL_SUBARCH_NAME(ApplyValidator,
                                NACL_TARGET_ARCH,
                                NACL_TARGET_SUBARCH)(
                                    sb_kind,
                                    guest_addr, data, size,
-                                   nap->bundle_size,
                                    TRUE, /* stub out */
                                    FALSE, /* text is not read-only */
                                    &nap->cpu_features,
                                    cache);
   }
   if (status == NaClValidationSucceeded) {
     /* Fixed feature CPU mode implies read-only */
     int readonly_text = nap->fixed_feature_cpu_mode;
     status = NACL_SUBARCH_NAME(ApplyValidator,
                                NACL_TARGET_ARCH,
                                NACL_TARGET_SUBARCH)(
                                    sb_kind,
                                    guest_addr, data, size,
-                                   nap->bundle_size,
                                    FALSE, /* do not stub out */
                                    readonly_text,
                                    &nap->cpu_features,
                                    cache);
   }
   return NaClValidateStatus(status);
 }
 
 int NaClValidateCodeReplacement(struct NaClApp *nap, uintptr_t guest_addr,
                                 uint8_t *data_old, uint8_t *data_new,
                                 size_t size) {
   enum NaClSBKind sb_kind = NACL_SB_DEFAULT;
   if (nap->validator_stub_out_mode) return LOAD_BAD_FILE;
   if (nap->fixed_feature_cpu_mode) return LOAD_BAD_FILE;
 
   if ((guest_addr % nap->bundle_size) != 0 ||
       (size % nap->bundle_size) != 0) {
     return LOAD_BAD_FILE;
   }
 
   return NaClValidateStatus(
       NACL_SUBARCH_NAME(ApplyValidatorCodeReplacement,
                         NACL_TARGET_ARCH,
                         NACL_TARGET_SUBARCH)
-      (sb_kind, guest_addr, data_old, data_new, size, nap->bundle_size,
-       &nap->cpu_features));
+      (sb_kind, guest_addr, data_old, data_new, size, &nap->cpu_features));
 }
 
 int NaClCopyCode(struct NaClApp *nap, uintptr_t guest_addr,
                  uint8_t *data_old, uint8_t *data_new,
                  size_t size) {
   enum NaClSBKind sb_kind = NACL_SB_DEFAULT;
   /* Fixed-feature mode disables any code copying for now. Currently
    * the only use of NaClCodeCopy() seems to be for dynamic code
    * modification, which should fail in NaClValidateCodeReplacement()
    * before reaching this.
    */
   if (nap->fixed_feature_cpu_mode) return LOAD_BAD_FILE;
   return NaClValidateStatus(
       NACL_SUBARCH_NAME(ApplyValidatorCopy,
                         NACL_TARGET_ARCH,
                         NACL_TARGET_SUBARCH)
-      (sb_kind, guest_addr, data_old, data_new, size, nap->bundle_size,
-       &nap->cpu_features));
+      (sb_kind, guest_addr, data_old, data_new, size, &nap->cpu_features));
 }
 
 NaClErrorCode NaClValidateImage(struct NaClApp  *nap) {
   uintptr_t               memp;
   uintptr_t               endp;
   size_t                  regionsize;
   NaClErrorCode           rcode;
 
   memp = nap->mem_start + NACL_TRAMPOLINE_END;
   endp = nap->mem_start + nap->static_text_end;
@@ skipping 17 matching lines @@
         NaClLog(LOG_ERROR,
                 "Run sel_ldr in debug mode to ignore validation failure.\n");
         NaClLog(LOG_ERROR,
                 "Run ncval <module-name> for validation error details.\n");
         rcode = LOAD_VALIDATION_FAILED;
       }
     }
   }
   return rcode;
 }