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

Load library using file handle.

Browse Source 
* This patch enables dlopen by file descriptor
   instead of path/name.

Bug: 15984217
Change-Id: Ib39051e00567fb97070bf96d8ce63993877c0a01
This commit is contained in:
Dmitriy Ivanov
2014-07-01 14:10:16 -07:00
parent 4d299a2cf7
commit 04dc91ae76
7 changed files with 122 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
linker/linker.cpp
View File

@@ -42,6 +42,7 @@
#include "private/bionic_tls.h"
#include "private/KernelArgumentBlock.h"
#include "private/ScopedPthreadMutexLocker.h"
#include "private/ScopedFd.h"
#include "linker.h"
#include "linker_debug.h"
@@ -696,11 +697,20 @@ static int open_library(const char* name) {
}
static soinfo* load_library(const char* name, int dlflags, const android_dlextinfo* extinfo) {
// Open the file.
int fd = open_library(name);
if (fd == -1) {
int fd = -1;
ScopedFd file_guard(-1);
if (extinfo != NULL && (extinfo->flags & ANDROID_DLEXT_USE_LIBRARY_FD) != 0) {
fd = extinfo->library_fd;
} else {
// Open the file.
fd = open_library(name);
if (fd == -1) {
DL_ERR("library \"%s\" not found", name);
return NULL;
}
file_guard.reset(fd);
}
ElfReader elf_reader(name, fd);
@@ -744,7 +754,7 @@ static soinfo* load_library(const char* name, int dlflags, const android_dlextin
// At this point we know that whatever is loaded @ base is a valid ELF
// shared library whose segments are properly mapped in.
TRACE("[ find_library_internal base=%p size=%zu name='%s' ]",
TRACE("[ load_library base=%p size=%zu name='%s' ]",
reinterpret_cast<void*>(si->base), si->size, si->name);
if (!soinfo_link_image(si, extinfo)) {
@@ -847,7 +857,7 @@ soinfo* do_dlopen(const char* name, int flags, const android_dlextinfo* extinfo)
return NULL;
}
if (extinfo != NULL && ((extinfo->flags & ~(ANDROID_DLEXT_VALID_FLAG_BITS)) != 0)) {
DL_ERR("invalid extended flags to android_dlopen_ext: %x", extinfo->flags);
DL_ERR("invalid extended flags to android_dlopen_ext: %llx", extinfo->flags);
return NULL;
}
protect_data(PROT_READ | PROT_WRITE);