commit da8e591c3996879e41dc5f70b77d1b0fe6f9c225
author Dmitriy Ivanov <dimitry@google.com> Fri Oct 31 13:46:42 2014 -0700
committer Dmitriy Ivanov <dimitry@google.com> Fri Oct 31 14:23:34 2014 -0700
tree ea87377877d60a29c7bfbc9ccf6723a1cfad1b47
parent d50495a56760fdc116b7484bcdf1183c76db9b37

Use local copy of the library name on dlopen

Bug: 18052100
Change-Id: Idbc2a3691db3b5525d4e9bca81d78d5f29bc438f

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index f14d8b4..1dae343 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -107,6 +107,8 @@
 #define LDPRELOAD_BUFSIZE (LDPRELOAD_MAX*64)
 #define LDPRELOAD_MAX 8
 
+#define MAX_PATH_LEN 512
+
 static char g_ld_library_paths_buffer[LDPATH_BUFSIZE];
 static const char* g_ld_library_paths[LDPATH_MAX + 1];
 
@@ -750,7 +752,7 @@
 }
 
 static int open_library_on_path(const char* name, const char* const paths[]) {
-  char buf[512];
+  char buf[MAX_PATH_LEN];
   for (size_t i = 0; paths[i] != nullptr; ++i) {
     int n = __libc_format_buffer(buf, sizeof(buf), "%s/%s", paths[i], name);
     if (n < 0 || n >= static_cast<int>(sizeof(buf))) {
@@ -1103,8 +1105,18 @@
       return nullptr;
     }
   }
+
+  size_t name_len = strlen(name);
+  if (name_len >= MAX_PATH_LEN) {
+    DL_ERR("library name \"%s\" is too long", name);
+    return nullptr;
+  }
+
+  char local_name[name_len+1];
+  strlcpy(local_name, name, name_len+1);
+
   protect_data(PROT_READ | PROT_WRITE);
-  soinfo* si = find_library(name, flags, extinfo);
+  soinfo* si = find_library(local_name, flags, extinfo);
   if (si != nullptr) {
     si->CallConstructors();
   }