diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-10-27 23:01:05 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-10-27 23:01:05 +0000 |
commit | 091413986ef61dfcce5fc994996ce883a5964a3e (patch) | |
tree | fb530e0d302071bab9b3cbfdfe2e7ce424596520 | |
parent | 94bd14237e3001edce602f2e08e01b26e02504fa (diff) | |
parent | f192ca3ca279cadc41aecd225c6b4d555bce6360 (diff) | |
download | art-android12L-d2-release.tar.gz |
Snap for 7859607 from f192ca3ca279cadc41aecd225c6b4d555bce6360 to sc-d2-releaseandroid-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-release
Change-Id: Iba70d1ab2df68eaaba7b54998a215c997eb3e50b
-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; |