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

Run constructors before resolving ifunc functions

Browse Source 
Bug: 17177284
Change-Id: I5714b9bc2d1ca8f8711806bfb68da3d524213e99
This commit is contained in:
Dmitriy Ivanov
2014-08-21 13:54:03 -07:00
parent 3157211849
commit 9598b8c415
6 changed files with 69 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
linker/linker.cpp
View File

@@ -466,14 +466,17 @@ static ElfW(Sym)* soinfo_elf_lookup(soinfo* si, unsigned hash, const char* name)
return NULL;
}
static void resolve_ifunc_symbols(soinfo* si) {
void soinfo::resolve_ifunc_symbols() {
if (!get_has_ifuncs()) {
return;
}
phdr_table_unprotect_segments(si->phdr, si->phnum, si->load_bias);
phdr_table_unprotect_segments(phdr, phnum, load_bias);
TRACE_TYPE(IFUNC, "CHECKING FOR IFUNCS AND PERFORMING SYMBOL UPDATES");
for (size_t i = 0; i < si->nchain; ++i) {
ElfW(Sym)* s = &si->symtab[i];
for (size_t i = 0; i < nchain; ++i) {
ElfW(Sym)* s = &symtab[i];
if (ELF_ST_TYPE(s->st_info) == STT_GNU_IFUNC) {
// The address of the ifunc in the symbol table is the address of the
// function that chooses the function to which the ifunc will refer.
@@ -481,12 +484,12 @@ static void resolve_ifunc_symbols(soinfo* si) {
// in the linker and then return its result (minus the base offset).
TRACE_TYPE(IFUNC, "FOUND IFUNC");
ElfW(Addr) (*ifunc_ptr)();
ifunc_ptr = reinterpret_cast<ElfW(Addr)(*)()>(s->st_value + si->base);
s->st_value = (ifunc_ptr() - si->base);
ifunc_ptr = reinterpret_cast<ElfW(Addr)(*)()>(s->st_value + base);
s->st_value = (ifunc_ptr() - base);
TRACE_TYPE(IFUNC, "NEW VALUE IS %p", (void*)s->st_value);
}
}
phdr_table_protect_segments(si->phdr, si->phnum, si->load_bias);
phdr_table_protect_segments(phdr, phnum, load_bias);
}
static unsigned elfhash(const char* _name) {
@@ -809,10 +812,6 @@ static soinfo* load_library(const char* name, int dlflags, const android_dlextin
return NULL;
}
// if the library has any ifuncs, we will need to resolve them so that dlsym
// can handle them properly
resolve_ifunc_symbols(si);
return si;
}
@@ -1567,6 +1566,8 @@ void soinfo::CallConstructors() {
// DT_INIT should be called before DT_INIT_ARRAY if both are present.
CallFunction("DT_INIT", init_func);
CallArray("DT_INIT_ARRAY", init_array, init_array_count, false);
resolve_ifunc_symbols();
}
void soinfo::CallDestructors() {