commit 0cdef7e7f3c6837b56a969120d9098463d1df8d8
author Evgenii Stepanov <eugenis@google.com> Mon Jul 06 17:56:31 2015 -0700
committer Evgenii Stepanov <eugenis@google.com> Tue Jul 07 10:56:06 2015 -0700
tree f44b3e6464e03267081879a3155daf6ad096d905
parent 83474cd38712c0f955174609a880deabebb27518

Respect caller DT_RUNPATH in dlopen().

When dlopen-ing a library, add the caller's DT_RUNPATH to the directory search
list. This fixes dlfcn.dt_runpath in bionic-unit-tests-glibc(32|64).

Bug: 21899363
Change-Id: Ife6a7e192939292cf4dc291b7e6b95945761cde3

linker/dlfcn.cpp

diff --git a/linker/dlfcn.cpp b/linker/dlfcn.cpp
index ef454ab..4993568 100644
--- a/linker/dlfcn.cpp
+++ b/linker/dlfcn.cpp
@@ -67,9 +67,10 @@
   do_android_update_LD_LIBRARY_PATH(ld_library_path);
 }
 
-static void* dlopen_ext(const char* filename, int flags, const android_dlextinfo* extinfo) {
+static void* dlopen_ext(const char* filename, int flags,
+                        const android_dlextinfo* extinfo, soinfo* caller) {
   ScopedPthreadMutexLocker locker(&g_dl_mutex);
-  soinfo* result = do_dlopen(filename, flags, extinfo);
+  soinfo* result = do_dlopen(filename, flags, extinfo, caller);
   if (result == nullptr) {
     __bionic_format_dlerror("dlopen failed", linker_get_error_buffer());
     return nullptr;
@@ -78,11 +79,15 @@
 }
 
 void* android_dlopen_ext(const char* filename, int flags, const android_dlextinfo* extinfo) {
-  return dlopen_ext(filename, flags, extinfo);
+  void* caller_addr = __builtin_return_address(0);
+  soinfo* caller = find_containing_library(caller_addr);
+  return dlopen_ext(filename, flags, extinfo, caller);
 }
 
 void* dlopen(const char* filename, int flags) {
-  return dlopen_ext(filename, flags, nullptr);
+  void* caller_addr = __builtin_return_address(0);
+  soinfo* caller = find_containing_library(caller_addr);
+  return dlopen_ext(filename, flags, nullptr, caller);
 }
 
 void* dlsym(void* handle, const char* symbol) {