Intial Thumb2 Sandbox (naclrev 6680)

src/trusted/service_runtime/sel_validate_image.c

Index: src/trusted/service_runtime/sel_validate_image.c
diff --git a/src/trusted/service_runtime/sel_validate_image.c b/src/trusted/service_runtime/sel_validate_image.c
index cea38a913cd7476ab0c560faa0094313ab3c9ad5..37e25e71dcc28078edafdbe707aa28255cb9e69b 100644
--- a/src/trusted/service_runtime/sel_validate_image.c
+++ b/src/trusted/service_runtime/sel_validate_image.c
@@ -25,10 +25,22 @@ static int NaClValidateStatus(NaClValidationStatus status) {
   }
 }
 
+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
@@ -56,14 +68,13 @@ int NaClValidateCode(struct NaClApp *nap, uintptr_t guest_addr,
 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,
@@ -74,11 +85,12 @@ int NaClValidateCodeReplacement(struct NaClApp *nap, uintptr_t guest_addr,
 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));
 }