diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-10-29 02:59:27 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-10-29 02:59:27 +0000 |
| commit | 00c84f21871a8df8c4acfd9469be80095f6c6a7d (patch) | |
| tree | fb530e0d302071bab9b3cbfdfe2e7ce424596520 | |
| parent | 1a6e422b8636244cb801bbb9f1d2ac50a1693e23 (diff) | |
| parent | 2b6640734494caeb24cc8f0b839ffcdf1a402c61 (diff) | |
| download | art-android12-qpr1-d-s2-release.tar.gz | |
Merge cherrypicks of [16093381] into sc-qpr1-d-release.android-12.0.0_r32android-12.0.0_r29android-12.0.0_r27android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-release
Change-Id: Icf785f6fcbfec66546d7a744294af20a322f4c74
| -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; |