Intial Thumb2 Sandbox (naclrev 6680)

src/trusted/service_runtime/sel_validate_image.c

 /*
  * Copyright (c) 2011 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"
 
 /* Translate validation status to values wanted by sel_ldr. */
 static int NaClValidateStatus(NaClValidationStatus status) {
   switch (status) {
     case NaClValidationSucceeded:
       return LOAD_OK;
     case NaClValidationFailedOutOfMemory:
       /* Note: this is confusing, but is what sel_ldr is expecting. */
       return LOAD_BAD_FILE;
     case NaClValidationFailed:
     case NaClValidationFailedNotImplemented:
     case NaClValidationFailedCpuNotSupported:
     case NaClValidationFailedSegmentationIssue:
     default:
       return LOAD_VALIDATION_FAILED;
   }
 }
 
+enum NaClSBKind getSBKind(struct NaClApp *nap) {
+  enum NaClSBKind sb_kind = NACL_SB_DEFAULT;
+#if NACL_ARCH(NACL_BUILD_ARCH) == NACL_arm
+  uintptr_t entry = nap->user_entry_pt ?
+      nap->user_entry_pt : nap->initial_entry_pt;
+  sb_kind = (entry & 1) ? NACL_SB_ARM_THUMB2 : sb_kind;
+#else
+  UNREFERENCED_PARAMETER(nap);
+#endif
+  return sb_kind;
+}
+
 int NaClValidateCode(struct NaClApp *nap, uintptr_t guest_addr,
                      uint8_t *data, size_t size) {
   NaClValidationStatus status = NaClValidationSucceeded;
-  enum NaClSBKind sb_kind = NACL_SB_DEFAULT;
+  enum NaClSBKind sb_kind = getSBKind(nap);
   if (nap->validator_stub_out_mode) {
     /* 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,
                                    NaClApplyValidationDoStubout,
                                    guest_addr, data, size,
                                    nap->bundle_size, TRUE);
   }
   if (status == NaClValidationSucceeded) {
     status = NACL_SUBARCH_NAME(ApplyValidator,
                                NACL_TARGET_ARCH,
                                NACL_TARGET_SUBARCH)(
                                    sb_kind,
                                    NaClApplyCodeValidation,
                                    guest_addr, data, size,
                                    nap->bundle_size, TRUE);
   }
   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;
+  enum NaClSBKind sb_kind = getSBKind(nap);
   if (nap->validator_stub_out_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));
 }
 
 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;
+  enum NaClSBKind sb_kind = getSBKind(nap);
   return NaClValidateStatus(
       NACL_SUBARCH_NAME(ApplyValidatorCopy,
                         NACL_TARGET_ARCH,
                         NACL_TARGET_SUBARCH)
+

[Karl, 2011/09/19 19:56:05]

NIT: why blank line here?

[jasonwkim, 2011/09/26 21:35:52]

Fixed

       (sb_kind, guest_addr, data_old, data_new, size, nap->bundle_size));
 }
 
 NaClErrorCode NaClValidateImage(struct NaClApp  *nap) {
   uintptr_t               memp;
   uintptr_t               endp;
   size_t                  regionsize;
   NaClErrorCode           rcode;
 
   memp = nap->mem_start + NACL_TRAMPOLINE_END;
@@ skipping 18 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;
 }