diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2021-10-27 11:31:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-27 11:31:34 +0000 |
| commit | f192ca3ca279cadc41aecd225c6b4d555bce6360 (patch) | |
| tree | fb530e0d302071bab9b3cbfdfe2e7ce424596520 | |
| parent | b214977b4e5248dce1960e4488959a5228d9876d (diff) | |
| parent | a09c5cf5e48456e64b40d1970971ed4fb8e95958 (diff) | |
| download | art-android12-qpr3-s7-release.tar.gz | |
Allow PROT_EXEC on the zygote mappings when falling back to ashmem am: 94e2fc9465 am: a09c5cf5e4android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-release
Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/16093381
Change-Id: I7911e0d3744021902bad197e35d0660160cf1355
| -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; |