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

Switch <elf.h> over to linux uapi under the covers.

Browse Source 
Remove the linker's reliance on BSD cruft and use the glibc-style
ElfW macro. (Other code too, but the linker contains the majority
of the code that needs to work for Elf32 and Elf64.)

All platforms need dl_iterate_phdr_static, so it doesn't make sense
to have that part of the per-architecture configuration.

Bug: 12476126
Change-Id: I1d7f918f1303a392794a6cd8b3512ff56bd6e487
This commit is contained in:
Elliott Hughes
2014-02-10 17:46:57 -08:00
parent eeb9a9f59a
commit 0266ae5f88
20 changed files with 533 additions and 1833 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libc/bionic/libc_init_static.cpp
View File

@@ -68,16 +68,16 @@ static void call_array(void(**list)()) {
}
static void apply_gnu_relro() {
Elf_Phdr* phdr_start = reinterpret_cast<Elf_Phdr*>(getauxval(AT_PHDR));
ElfW(Phdr)* phdr_start = reinterpret_cast<ElfW(Phdr)*>(getauxval(AT_PHDR));
unsigned long int phdr_ct = getauxval(AT_PHNUM);
for (Elf_Phdr* phdr = phdr_start; phdr < (phdr_start + phdr_ct); phdr++) {
for (ElfW(Phdr)* phdr = phdr_start; phdr < (phdr_start + phdr_ct); phdr++) {
if (phdr->p_type != PT_GNU_RELRO) {
continue;
}
Elf_Addr seg_page_start = PAGE_START(phdr->p_vaddr);
Elf_Addr seg_page_end = PAGE_END(phdr->p_vaddr + phdr->p_memsz);
ElfW(Addr) seg_page_start = PAGE_START(phdr->p_vaddr);
ElfW(Addr) seg_page_end = PAGE_END(phdr->p_vaddr + phdr->p_memsz);
// Check return value here? What do we do if we fail?
mprotect(reinterpret_cast<void*>(seg_page_start), seg_page_end - seg_page_start, PROT_READ);