generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "linker: never mark pages simultaneously writable / executable"

Browse Source
This commit is contained in:
Nick Kralevich
2015-04-02 13:29:48 +00:00
committed by Gerrit Code Review
parent ab7c79e22e 8fdb3419a5
commit 3cc3f17aa4
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
linker/linker_phdr.cpp
View File

@@ -429,9 +429,15 @@ static int _phdr_table_set_load_prot(const ElfW(Phdr)* phdr_table, size_t phdr_c
ElfW(Addr) seg_page_start = PAGE_START(phdr->p_vaddr) + load_bias; ElfW(Addr) seg_page_start = PAGE_START(phdr->p_vaddr) + load_bias;
ElfW(Addr) seg_page_end = PAGE_END(phdr->p_vaddr + phdr->p_memsz) + load_bias; ElfW(Addr) seg_page_end = PAGE_END(phdr->p_vaddr + phdr->p_memsz) + load_bias;
int prot = PFLAGS_TO_PROT(phdr->p_flags);
if ((extra_prot_flags & PROT_WRITE) != 0) {
// make sure we're never simultaneously writable / executable
prot &= ~PROT_EXEC;
}
int ret = mprotect(reinterpret_cast<void*>(seg_page_start), int ret = mprotect(reinterpret_cast<void*>(seg_page_start),
seg_page_end - seg_page_start, seg_page_end - seg_page_start,
PFLAGS_TO_PROT(phdr->p_flags) | extra_prot_flags); prot | extra_prot_flags);
if (ret < 0) { if (ret < 0) {
return -1; return -1;
} }