From e44fffd7f9b93b9ec9836cfc7acedf7e21107f8f Mon Sep 17 00:00:00 2001
From: Dmitriy Ivanov <dimitry@google.com>
Date: Tue, 17 Mar 2015 17:12:18 -0700
Subject: [PATCH] Fix library lookup for filenames with slash.
If filename contains a slash, then it is interpreted
as a (relative or absolute) pathname.
Bug: https://code.google.com/p/android/issues/detail?id=6670
Change-Id: Iba57d638301f3089ad47ba083edca2dd36b801ed
---
linker/linker.cpp | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/linker/linker.cpp b/linker/linker.cpp
index 15ea423f9..3960f9aa8 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -942,12 +942,8 @@ static int open_library(const char* name, off64_t* file_offset) {
int fd = TEMP_FAILURE_RETRY(open(name, O_RDONLY | O_CLOEXEC));
if (fd != -1) {
*file_offset = 0;
- return fd;
}
- // ...but nvidia binary blobs (at least) rely on this behavior, so fall through for now.
-#if defined(__LP64__)
- return -1;
-#endif
+ return fd;
}
// Otherwise we try LD_LIBRARY_PATH first, and fall back to the built-in well known paths.