commit ea3df0c52b6ebe5e24f2d36259d97fd06f8e8a1a
author Elliott Hughes <enh@google.com> Thu Jun 29 23:48:43 2017 +0000
committer Elliott Hughes <enh@google.com> Thu Jun 29 23:48:43 2017 +0000
tree 09f7a5f2644cc262e0b5c8e426e30480524a56a4
parent ae735163e51fbc7cac4217ce392c4894efdfc5a7

Revert "arm64: expand CFI shadow to cover 48-bit virtual addresses"

This reverts commit ae735163e51fbc7cac4217ce392c4894efdfc5a7.

QA claims this causes:

  AndroidRuntime: java.lang.NullPointerException: Attempt to invoke virtual method 'void android.media.MediaPlayer.setSurface(android.view.Surface)' on a null object reference
  AndroidRuntime:        at com.android.setupwizardlib....

Bug: http://b/63141434
Change-Id: I05a6849471623d4cde8b254b1020b0ccbd84b699

libc/private/CFIShadow.h

diff --git a/libc/private/CFIShadow.h b/libc/private/CFIShadow.h
index 9f980f8..26351db 100644
--- a/libc/private/CFIShadow.h
+++ b/libc/private/CFIShadow.h
@@ -62,7 +62,7 @@
   static constexpr uintptr_t kCfiCheckAlign = 1UL << kCfiCheckGranularity;  // 4K
 
 #if defined(__aarch64__)
-  static constexpr uintptr_t kMaxTargetAddr = 0xffffffffffff;
+  static constexpr uintptr_t kMaxTargetAddr = 0x7fffffffff;
 #elif defined (__LP64__)
   static constexpr uintptr_t kMaxTargetAddr = 0x7fffffffffff;
 #else