pa-fazil
/
android_bionic
mirror of https://github.com/fazilsheik96/android_bionic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This reverts commit ae735163e5.

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
This commit is contained in:
Elliott Hughes 2017-06-29 23:48:43 +00:00
parent ae735163e5
commit ea3df0c52b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libc/private/CFIShadow.h
View File

@ -62,7 +62,7 @@ class CFIShadow {
static constexpr uintptr_t kCfiCheckAlign = 1UL << kCfiCheckGranularity; // 4K static constexpr uintptr_t kCfiCheckAlign = 1UL << kCfiCheckGranularity; // 4K
#if defined(__aarch64__) #if defined(__aarch64__)
static constexpr uintptr_t kMaxTargetAddr = 0xffffffffffff; static constexpr uintptr_t kMaxTargetAddr = 0x7fffffffff;
#elif defined (__LP64__) #elif defined (__LP64__)
static constexpr uintptr_t kMaxTargetAddr = 0x7fffffffffff; static constexpr uintptr_t kMaxTargetAddr = 0x7fffffffffff;
#else #else