tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Link vdso before linking the main executable"

Browse source
This commit is contained in:
Treehugger Robot 2017-09-26 17:10:00 +00:00 committed by Gerrit Code Review
commit 62767bc31d
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
linker/linker_main.cpp
View file

@ -154,6 +154,10 @@ static void add_vdso(KernelArgumentBlock& args) {
si->prelink_image();
si->link_image(g_empty_list, soinfo_list_t::make_list(si), nullptr);
// prevents accidental unloads...
si->set_dt_flags_1(si->get_dt_flags_1() | DF_1_NODELETE);
si->set_linked();
si->call_constructors();
}
/* gdb expects the linker to be in the debug shared object list.
@ -352,6 +356,8 @@ static ElfW(Addr) __linker_init_post_relocation(KernelArgumentBlock& args) {
}
}
add_vdso(args);
// Load ld_preloads and dependencies.
std::vector<const char*> needed_library_name_list;
size_t ld_preloads_count = 0;
@ -393,8 +399,6 @@ static ElfW(Addr) __linker_init_post_relocation(KernelArgumentBlock& args) {
si->increment_ref_count();
}
add_vdso(args);
if (!get_cfi_shadow()->InitialLinkDone(solist)) __linker_cannot_link(g_argv[0]);
si->call_pre_init_constructors();

6
tests/dlfcn_test.cpp
View file

@ -245,6 +245,12 @@ TEST(dlfcn, dlopen_by_soname) {
dlclose(handle);
}
TEST(dlfcn, dlopen_vdso) {
void* handle = dlopen("linux-vdso.so.1", RTLD_NOW);
ASSERT_TRUE(handle != nullptr) << dlerror();
dlclose(handle);
}
// mips doesn't support ifuncs
#if !defined(__mips__)
TEST(dlfcn, ifunc_variable) {