| commit | f192ca3ca279cadc41aecd225c6b4d555bce6360 | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Wed Oct 27 11:31:34 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Oct 27 11:31:34 2021 +0000 |
| tree | fb530e0d302071bab9b3cbfdfe2e7ce424596520 | |
| parent | b214977b4e5248dce1960e4488959a5228d9876d [diff] | |
| parent | a09c5cf5e48456e64b40d1970971ed4fb8e95958 [diff] |
Allow PROT_EXEC on the zygote mappings when falling back to ashmem am: 94e2fc9465 am: a09c5cf5e4 Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/16093381 Change-Id: I7911e0d3744021902bad197e35d0660160cf1355
diff --git a/runtime/jit/jit_memory_region.cc b/runtime/jit/jit_memory_region.cc index b0699c4..56407f5 100644 --- a/runtime/jit/jit_memory_region.cc +++ b/runtime/jit/jit_memory_region.cc
@@ -556,7 +556,7 @@ 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;