diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-10-29 18:09:24 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-10-29 18:09:24 +0000 |
| commit | b534f2fbc0308caf3e33f5054890a44a84664eca (patch) | |
| tree | fb530e0d302071bab9b3cbfdfe2e7ce424596520 | |
| parent | 3614aaf4d4874b1e0faaf7648327d2448b015add (diff) | |
| parent | 1a0453876f3cd780713f6b054ba97eeaa326b97a (diff) | |
Merge cherrypicks of [16093381] into sc-qpr1-release.
Change-Id: I2045dd5cfdc76b61e1989fa0e2d238c5e6affc91
| -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; |