diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-10-27 23:01:19 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-10-27 23:01:19 +0000 |
commit | ab1f62ad90952006e0a47cabdb3e5a3bcd07124e (patch) | |
tree | fb530e0d302071bab9b3cbfdfe2e7ce424596520 | |
parent | bb601deb8af6050fb90cf37c44b4b6cd42236f5b (diff) | |
parent | f192ca3ca279cadc41aecd225c6b4d555bce6360 (diff) | |
download | art-android12L-s1-release.tar.gz |
Snap for 7859607 from f192ca3ca279cadc41aecd225c6b4d555bce6360 to sc-v2-releaseandroid-vts-12.1_r1android-s-v2-preview-2android-s-v2-beta-2android-platform-12.1.0_r9android-platform-12.1.0_r8android-platform-12.1.0_r7android-platform-12.1.0_r6android-platform-12.1.0_r5android-platform-12.1.0_r4android-platform-12.1.0_r3android-platform-12.1.0_r27android-platform-12.1.0_r26android-platform-12.1.0_r25android-platform-12.1.0_r24android-platform-12.1.0_r23android-platform-12.1.0_r22android-platform-12.1.0_r21android-platform-12.1.0_r20android-platform-12.1.0_r2android-platform-12.1.0_r19android-platform-12.1.0_r18android-platform-12.1.0_r17android-platform-12.1.0_r16android-platform-12.1.0_r15android-platform-12.1.0_r14android-platform-12.1.0_r13android-platform-12.1.0_r12android-platform-12.1.0_r11android-platform-12.1.0_r10android-platform-12.1.0_r1android-cts-12.1_r1android-12.1.0_r6android-12.1.0_r5android-12.1.0_r4android-12.1.0_r3android-12.1.0_r27android-12.1.0_r2android-12.1.0_r1android12L-s1-releaseandroid12L-releaseandroid12L-platform-release
Change-Id: I83760e7c6b049aa60d0079f4da2d7b7afb6d5c1c
-rw-r--r-- | runtime/jit/jit_memory_region.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/jit/jit_memory_region.cc b/runtime/jit/jit_memory_region.cc index b0699c42d3..56407f58c0 100644 --- a/runtime/jit/jit_memory_region.cc +++ b/runtime/jit/jit_memory_region.cc @@ -556,7 +556,7 @@ bool JitMemoryRegion::ProtectZygoteMemory(int fd, std::string* error_msg) { return false; } } else { - palette_status_t status = PaletteAshmemSetProtRegion(fd, PROT_READ); + palette_status_t status = PaletteAshmemSetProtRegion(fd, PROT_READ | PROT_EXEC); if (status != PALETTE_STATUS_OK) { CHECK_EQ(status, PALETTE_STATUS_CHECK_ERRNO); std::ostringstream oss; |