diff options
Diffstat (limited to 'linker/linker_phdr.cpp')
| -rw-r--r-- | linker/linker_phdr.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/linker/linker_phdr.cpp b/linker/linker_phdr.cpp index bced72296..5b0ee491a 100644 --- a/linker/linker_phdr.cpp +++ b/linker/linker_phdr.cpp @@ -36,6 +36,7 @@ #include <unistd.h> #include "linker.h" +#include "linker_dlwarning.h" #include "linker_globals.h" #include "linker_debug.h" #include "linker_utils.h" @@ -605,10 +606,14 @@ bool ElfReader::LoadSegments() { if (file_length != 0) { int prot = PFLAGS_TO_PROT(phdr->p_flags); - // W + E PT_LOAD segments are not allowed. if ((prot & (PROT_EXEC | PROT_WRITE)) == (PROT_EXEC | PROT_WRITE)) { - DL_ERR_AND_LOG("\"%s\": W + E load segments are not allowed", name_.c_str()); - return false; + // W + E PT_LOAD segments are not allowed in O. + if (get_application_target_sdk_version() > 25) { + DL_ERR_AND_LOG("\"%s\": W + E load segments are not allowed", name_.c_str()); + return false; + } + DL_WARN("\"%s\": W + E load segments are not allowed", name_.c_str()); + add_dlwarning(name_.c_str(), "W+E load segments"); } void* seg_addr = mmap64(reinterpret_cast<void*>(seg_page_start), |