Allow invoking the linker on an executable.
The executable can be inside a zip file using the same syntax used for
shared objects: path.zip!/libentry.so.
The linker currently requires an absolute path. This restriction could be
loosened, but it didn't seem important? If it allowed non-absolute paths,
we'd need to decide how to handle:
- foo/bar (relative to CWD?)
- foo (search PATH / LD_LIBRARY_PATH, or also relative to CWD?)
- foo.zip!/bar (normalize_path() requires an absolute path)
The linker adjusts the argc/argv passed to main() and to constructor
functions to hide the initial linker argument, but doesn't adjust the auxv
vector or files like /proc/self/{exe,cmdline,auxv,stat}. Those files will
report that the kernel loaded the linker as an executable.
I think the linker_logger.cpp change guarding against (g_argv == NULL)
isn't actually necessary, but it seemed like a good idea given that I'm
delaying initialization of g_argv until after C++ constructors have run.
Bug: http://b/112050209
Test: bionic unit tests
Change-Id: I846faf98b16fd34218946f6167e8b451897debe5
diff --git a/libc/bionic/libc_init_dynamic.cpp b/libc/bionic/libc_init_dynamic.cpp
index 0def359..5f76354 100644
--- a/libc/bionic/libc_init_dynamic.cpp
+++ b/libc/bionic/libc_init_dynamic.cpp
@@ -133,7 +133,9 @@
__cxa_atexit(__libc_fini,structors->fini_array,nullptr);
}
- exit(slingshot(args.argc, args.argv, args.envp));
+ exit(slingshot(args.argc - __libc_shared_globals->initial_linker_arg_count,
+ args.argv + __libc_shared_globals->initial_linker_arg_count,
+ args.envp));
}
extern "C" uint32_t android_get_application_target_sdk_version();
diff --git a/libc/private/bionic_globals.h b/libc/private/bionic_globals.h
index eee33c9..8c00551 100644
--- a/libc/private/bionic_globals.h
+++ b/libc/private/bionic_globals.h
@@ -47,6 +47,11 @@
// Globals shared between the dynamic linker and libc.so.
struct libc_shared_globals {
FdTable fd_table;
+
+ // When the linker is invoked on a binary (e.g. `linker64 /system/bin/date`),
+ // record the number of arguments passed to the linker itself rather than to
+ // the program it's loading. Typically 0, sometimes 1.
+ int initial_linker_arg_count;
};
__LIBC_HIDDEN__ extern libc_shared_globals* __libc_shared_globals;
diff --git a/linker/linker.cpp b/linker/linker.cpp
index 277b823..b605ed9 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -289,7 +289,7 @@
}
soinfo* soinfo_alloc(android_namespace_t* ns, const char* name,
- struct stat* file_stat, off64_t file_offset,
+ const struct stat* file_stat, off64_t file_offset,
uint32_t rtld_flags) {
if (strlen(name) >= PATH_MAX) {
async_safe_fatal("library name \"%s\" too long", name);
@@ -1011,6 +1011,28 @@
return true;
}
+static int open_library_at_path(ZipArchiveCache* zip_archive_cache,
+ const char* path, off64_t* file_offset,
+ std::string* realpath) {
+ int fd = -1;
+ if (strstr(path, kZipFileSeparator) != nullptr) {
+ fd = open_library_in_zipfile(zip_archive_cache, path, file_offset, realpath);
+ }
+
+ if (fd == -1) {
+ fd = TEMP_FAILURE_RETRY(open(path, O_RDONLY | O_CLOEXEC));
+ if (fd != -1) {
+ *file_offset = 0;
+ if (!realpath_fd(fd, realpath)) {
+ PRINT("warning: unable to get realpath for the library \"%s\". Will use given path.", path);
+ *realpath = path;
+ }
+ }
+ }
+
+ return fd;
+}
+
static int open_library_on_paths(ZipArchiveCache* zip_archive_cache,
const char* name, off64_t* file_offset,
const std::vector<std::string>& paths,
@@ -1021,22 +1043,7 @@
continue;
}
- int fd = -1;
- if (strstr(buf, kZipFileSeparator) != nullptr) {
- fd = open_library_in_zipfile(zip_archive_cache, buf, file_offset, realpath);
- }
-
- if (fd == -1) {
- fd = TEMP_FAILURE_RETRY(open(buf, O_RDONLY | O_CLOEXEC));
- if (fd != -1) {
- *file_offset = 0;
- if (!realpath_fd(fd, realpath)) {
- PRINT("warning: unable to get realpath for the library \"%s\". Will use given path.", buf);
- *realpath = buf;
- }
- }
- }
-
+ int fd = open_library_at_path(zip_archive_cache, buf, file_offset, realpath);
if (fd != -1) {
return fd;
}
@@ -1098,6 +1105,11 @@
return fd;
}
+int open_executable(const char* path, off64_t* file_offset, std::string* realpath) {
+ ZipArchiveCache zip_archive_cache;
+ return open_library_at_path(&zip_archive_cache, path, file_offset, realpath);
+}
+
const char* fix_dt_needed(const char* dt_needed, const char* sopath __unused) {
#if !defined(__LP64__)
// Work around incorrect DT_NEEDED entries for old apps: http://b/21364029
diff --git a/linker/linker.h b/linker/linker.h
index 7aa7e5f..dd45f67 100644
--- a/linker/linker.h
+++ b/linker/linker.h
@@ -103,6 +103,8 @@
soinfo* find_containing_library(const void* p);
+int open_executable(const char* path, off64_t* file_offset, std::string* realpath);
+
void do_android_get_LD_LIBRARY_PATH(char*, size_t);
void do_android_update_LD_LIBRARY_PATH(const char* ld_library_path);
void* do_dlopen(const char* name,
diff --git a/linker/linker_logger.cpp b/linker/linker_logger.cpp
index 4c6603b..d0e5072 100644
--- a/linker/linker_logger.cpp
+++ b/linker/linker_logger.cpp
@@ -106,8 +106,8 @@
static CachedProperty debug_ld_all("debug.ld.all");
flags_ |= ParseProperty(debug_ld_all.Get());
- // Ignore processes started without argv (http://b/33276926).
- if (g_argv[0] == nullptr) {
+ // Safeguard against a NULL g_argv. Ignore processes started without argv (http://b/33276926).
+ if (g_argv == nullptr || g_argv[0] == nullptr) {
return;
}
diff --git a/linker/linker_main.cpp b/linker/linker_main.cpp
index c5e0b96..f7c496a 100644
--- a/linker/linker_main.cpp
+++ b/linker/linker_main.cpp
@@ -35,10 +35,12 @@
#include "linker_phdr.h"
#include "linker_utils.h"
+#include "private/bionic_auxv.h"
#include "private/bionic_globals.h"
#include "private/bionic_tls.h"
#include "private/KernelArgumentBlock.h"
+#include "android-base/unique_fd.h"
#include "android-base/strings.h"
#include "android-base/stringprintf.h"
#ifdef __ANDROID__
@@ -52,7 +54,7 @@
extern void __libc_init_globals(KernelArgumentBlock&);
extern void __libc_init_AT_SECURE(KernelArgumentBlock&);
-extern "C" void _start();
+__LIBC_HIDDEN__ extern "C" void _start();
static ElfW(Addr) get_elf_exec_load_bias(const ElfW(Ehdr)* elf);
@@ -182,22 +184,41 @@
extern "C" int __system_properties_init(void);
-static const char* get_executable_path() {
- static std::string executable_path;
- if (executable_path.empty()) {
- if (!is_init()) {
- char path[PATH_MAX];
- ssize_t path_len = readlink("/proc/self/exe", path, sizeof(path));
- if (path_len == -1 || path_len >= static_cast<ssize_t>(sizeof(path))) {
- async_safe_fatal("readlink('/proc/self/exe') failed: %s", strerror(errno));
- }
- executable_path = std::string(path, path_len);
- } else {
- executable_path = "/init";
+struct ExecutableInfo {
+ std::string path;
+ struct stat file_stat;
+ const ElfW(Phdr)* phdr;
+ size_t phdr_count;
+ ElfW(Addr) entry_point;
+};
+
+static ExecutableInfo get_executable_info(KernelArgumentBlock& args) {
+ ExecutableInfo result = {};
+
+ if (is_init()) {
+ // /proc fs is not mounted when init starts. Therefore we can't use
+ // /proc/self/exe for init.
+ stat("/init", &result.file_stat);
+ result.path = "/init";
+ } else {
+ // Stat "/proc/self/exe" instead of executable_path because
+ // the executable could be unlinked by this point and it should
+ // not cause a crash (see http://b/31084669)
+ if (TEMP_FAILURE_RETRY(stat("/proc/self/exe", &result.file_stat)) != 0) {
+ async_safe_fatal("unable to stat \"/proc/self/exe\": %s", strerror(errno));
}
+ char path[PATH_MAX];
+ ssize_t path_len = readlink("/proc/self/exe", path, sizeof(path));
+ if (path_len == -1 || path_len >= static_cast<ssize_t>(sizeof(path))) {
+ async_safe_fatal("readlink('/proc/self/exe') failed: %s", strerror(errno));
+ }
+ result.path = std::string(path, path_len);
}
- return executable_path.c_str();
+ result.phdr = reinterpret_cast<const ElfW(Phdr)*>(args.getauxval(AT_PHDR));
+ result.phdr_count = args.getauxval(AT_PHNUM);
+ result.entry_point = args.getauxval(AT_ENTRY);
+ return result;
}
#if defined(__LP64__)
@@ -206,21 +227,62 @@
static char kLinkerPath[] = "/system/bin/linker";
#endif
-static void __linker_cannot_link(const char* argv0) {
- async_safe_format_fd(STDERR_FILENO,
- "CANNOT LINK EXECUTABLE \"%s\": %s\n",
- argv0,
- linker_get_error_buffer());
+__printflike(1, 2)
+static void __linker_error(const char* fmt, ...) {
+ va_list ap;
- async_safe_format_log(ANDROID_LOG_FATAL,
- "linker",
- "CANNOT LINK EXECUTABLE \"%s\": %s",
- argv0,
- linker_get_error_buffer());
+ va_start(ap, fmt);
+ async_safe_format_fd_va_list(STDERR_FILENO, fmt, ap);
+ va_end(ap);
+
+ va_start(ap, fmt);
+ async_safe_format_log_va_list(ANDROID_LOG_FATAL, "linker", fmt, ap);
+ va_end(ap);
+
_exit(EXIT_FAILURE);
}
-static ElfW(Addr) linker_main(KernelArgumentBlock& args) {
+static void __linker_cannot_link(const char* argv0) {
+ __linker_error("CANNOT LINK EXECUTABLE \"%s\": %s\n",
+ argv0,
+ linker_get_error_buffer());
+}
+
+// Load an executable. Normally the kernel has already loaded the executable when the linker
+// starts. The linker can be invoked directly on an executable, though, and then the linker must
+// load it. This function doesn't load dependencies or resolve relocations.
+static ExecutableInfo load_executable(const char* orig_path) {
+ ExecutableInfo result = {};
+
+ if (orig_path[0] != '/') {
+ __linker_error("error: expected absolute path: \"%s\"\n", orig_path);
+ }
+
+ off64_t file_offset;
+ android::base::unique_fd fd(open_executable(orig_path, &file_offset, &result.path));
+ if (fd.get() == -1) {
+ __linker_error("error: unable to open file \"%s\"\n", orig_path);
+ }
+
+ if (TEMP_FAILURE_RETRY(fstat(fd.get(), &result.file_stat)) == -1) {
+ __linker_error("error: unable to stat \"%s\": %s\n", result.path.c_str(), strerror(errno));
+ }
+
+ ElfReader elf_reader;
+ if (!elf_reader.Read(result.path.c_str(), fd.get(), file_offset, result.file_stat.st_size)) {
+ __linker_error("error: %s\n", linker_get_error_buffer());
+ }
+ if (!elf_reader.Load(nullptr)) {
+ __linker_error("error: %s\n", linker_get_error_buffer());
+ }
+
+ result.phdr = elf_reader.loaded_phdr();
+ result.phdr_count = elf_reader.phdr_count();
+ result.entry_point = elf_reader.entry_point();
+ return result;
+}
+
+static ElfW(Addr) linker_main(KernelArgumentBlock& args, const char* exe_to_load) {
ProtectedDataGuard guard;
#if TIMING
@@ -274,31 +336,25 @@
}
}
- struct stat file_stat;
- // Stat "/proc/self/exe" instead of executable_path because
- // the executable could be unlinked by this point and it should
- // not cause a crash (see http://b/31084669)
- if (!is_init()) {
- if (TEMP_FAILURE_RETRY(stat("/proc/self/exe", &file_stat)) != 0) {
- async_safe_fatal("unable to stat \"/proc/self/exe\": %s", strerror(errno));
- }
- } else {
- // /proc fs is not mounted when init starts. Therefore we can't use
- // /proc/self/exe for init.
- stat("/init", &file_stat);
- }
+ const ExecutableInfo exe_info = exe_to_load ? load_executable(exe_to_load) :
+ get_executable_info(args);
+
+ // Assign to a static variable for the sake of the debug map, which needs
+ // a C-style string to last until the program exits.
+ static std::string exe_path = exe_info.path;
// Initialize the main exe's soinfo.
- const char* executable_path = get_executable_path();
- soinfo* si = soinfo_alloc(&g_default_namespace, executable_path, &file_stat, 0, RTLD_GLOBAL);
+ soinfo* si = soinfo_alloc(&g_default_namespace,
+ exe_path.c_str(), &exe_info.file_stat,
+ 0, RTLD_GLOBAL);
somain = si;
- si->phdr = reinterpret_cast<ElfW(Phdr)*>(args.getauxval(AT_PHDR));
- si->phnum = args.getauxval(AT_PHNUM);
+ si->phdr = exe_info.phdr;
+ si->phnum = exe_info.phdr_count;
get_elf_base_from_phdr(si->phdr, si->phnum, &si->base, &si->load_bias);
si->size = phdr_table_get_load_size(si->phdr, si->phnum);
si->dynamic = nullptr;
si->set_main_executable();
- init_link_map_head(*si, executable_path);
+ init_link_map_head(*si, exe_path.c_str());
// Register the main executable and the linker upfront to have
// gdb aware of them before loading the rest of the dependency
@@ -336,7 +392,7 @@
parse_LD_LIBRARY_PATH(ldpath_env);
parse_LD_PRELOAD(ldpreload_env);
- std::vector<android_namespace_t*> namespaces = init_default_namespaces(executable_path);
+ std::vector<android_namespace_t*> namespaces = init_default_namespaces(exe_path.c_str());
if (!si->prelink_image()) __linker_cannot_link(g_argv[0]);
@@ -437,7 +493,7 @@
fflush(stdout);
#endif
- ElfW(Addr) entry = args.getauxval(AT_ENTRY);
+ ElfW(Addr) entry = exe_info.entry_point;
TRACE("[ Ready to execute \"%s\" @ %p ]", si->get_realpath(), reinterpret_cast<void*>(entry));
return entry;
}
@@ -502,12 +558,22 @@
__libc_init_sysinfo(args);
#endif
+ // When the linker is run by itself (rather than as an interpreter for
+ // another program), AT_BASE is 0.
ElfW(Addr) linker_addr = args.getauxval(AT_BASE);
if (linker_addr == 0) {
- // When the linker is run by itself (rather than as an interpreter for
- // another program), AT_BASE is 0. In that case, the AT_PHDR and AT_PHNUM
- // aux values describe the linker, so use the phdr to find the linker's
- // base address.
+ // Detect an attempt to run the linker on itself (e.g.
+ // `linker64 /system/bin/linker64`). If the kernel loaded this instance of
+ // the linker, then AT_ENTRY will refer to &_start. If it doesn't, then
+ // something else must have loaded this instance of the linker. It's
+ // simpler if we only allow one copy of the linker to be loaded at a time.
+ if (args.getauxval(AT_ENTRY) != reinterpret_cast<uintptr_t>(&_start)) {
+ // The first linker already relocated this one and set up TLS, so we don't
+ // need further libc initialization.
+ __linker_error("error: linker cannot load itself\n");
+ }
+ // Otherwise, the AT_PHDR and AT_PHNUM aux values describe this linker
+ // instance, so use the phdr to find the linker's base address.
ElfW(Addr) load_bias;
get_elf_base_from_phdr(
reinterpret_cast<ElfW(Phdr)*>(args.getauxval(AT_PHDR)), args.getauxval(AT_PHNUM),
@@ -565,28 +631,38 @@
// Initialize the linker's static libc's globals
__libc_init_globals(args);
- // store argc/argv/envp to use them for calling constructors
- g_argc = args.argc;
- g_argv = args.argv;
- g_envp = args.envp;
-
// Initialize the linker's own global variables
tmp_linker_so.call_constructors();
- // If the linker is not acting as PT_INTERP entry_point is equal to
- // _start. Which means that the linker is running as an executable and
- // already linked by PT_INTERP.
- //
- // This happens when user tries to run 'adb shell /system/bin/linker'
- // see also https://code.google.com/p/android/issues/detail?id=63174
- ElfW(Addr) entry_point = args.getauxval(AT_ENTRY);
- if (reinterpret_cast<ElfW(Addr)>(&_start) == entry_point) {
- async_safe_format_fd(STDOUT_FILENO,
- "This is %s, the helper program for dynamic executables.\n",
- args.argv[0]);
- exit(0);
+ // When the linker is run directly rather than acting as PT_INTERP, parse
+ // arguments and determine the executable to load. When it's instead acting
+ // as PT_INTERP, AT_ENTRY will refer to the loaded executable rather than the
+ // linker's _start.
+ const char* exe_to_load = nullptr;
+ if (args.getauxval(AT_ENTRY) == reinterpret_cast<uintptr_t>(&_start)) {
+ if (args.argc <= 1 || !strcmp(args.argv[1], "--help")) {
+ async_safe_format_fd(STDOUT_FILENO,
+ "Usage: %s program [arguments...]\n"
+ " %s path.zip!/program [arguments...]\n"
+ "\n"
+ "A helper program for linking dynamic executables. Typically, the kernel loads\n"
+ "this program because it's the PT_INTERP of a dynamic executable.\n"
+ "\n"
+ "This program can also be run directly to load and run a dynamic executable. The\n"
+ "executable can be inside a zip file if it's stored uncompressed and at a\n"
+ "page-aligned offset.\n",
+ args.argv[0], args.argv[0]);
+ exit(0);
+ }
+ exe_to_load = args.argv[1];
+ __libc_shared_globals->initial_linker_arg_count = 1;
}
+ // store argc/argv/envp to use them for calling constructors
+ g_argc = args.argc - __libc_shared_globals->initial_linker_arg_count;
+ g_argv = args.argv + __libc_shared_globals->initial_linker_arg_count;
+ g_envp = args.envp;
+
// Initialize static variables. Note that in order to
// get correct libdl_info we need to call constructors
// before get_libdl_info().
@@ -595,7 +671,7 @@
init_link_map_head(*solinker, kLinkerPath);
args.abort_message_ptr = &g_abort_message;
- ElfW(Addr) start_address = linker_main(args);
+ ElfW(Addr) start_address = linker_main(args, exe_to_load);
INFO("[ Jumping to _start (%p)... ]", reinterpret_cast<void*>(start_address));
diff --git a/linker/linker_main.h b/linker/linker_main.h
index b37b947..47d4bdb 100644
--- a/linker/linker_main.h
+++ b/linker/linker_main.h
@@ -50,7 +50,7 @@
std::vector<android_namespace_t*> init_default_namespaces(const char* executable_path);
soinfo* soinfo_alloc(android_namespace_t* ns, const char* name,
- struct stat* file_stat, off64_t file_offset,
+ const struct stat* file_stat, off64_t file_offset,
uint32_t rtld_flags);
bool find_libraries(android_namespace_t* ns,
diff --git a/linker/linker_phdr.h b/linker/linker_phdr.h
index 9b9ce94..0eee089 100644
--- a/linker/linker_phdr.h
+++ b/linker/linker_phdr.h
@@ -54,6 +54,7 @@
const ElfW(Dyn)* dynamic() const { return dynamic_; }
const char* get_string(ElfW(Word) index) const;
bool is_mapped_by_caller() const { return mapped_by_caller_; }
+ ElfW(Addr) entry_point() const { return header_.e_entry + load_bias_; }
private:
bool ReadElfHeader();
diff --git a/tests/Android.bp b/tests/Android.bp
index 5ba6b3d..4ad51da 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -466,6 +466,8 @@
required: [
"cfi_test_helper",
"cfi_test_helper2",
+ "exec_linker_helper",
+ "exec_linker_helper_lib",
"libtest_dt_runpath_a",
"libtest_dt_runpath_b",
"libtest_dt_runpath_c",
diff --git a/tests/dl_test.cpp b/tests/dl_test.cpp
index 44fab01..cb98cae 100644
--- a/tests/dl_test.cpp
+++ b/tests/dl_test.cpp
@@ -79,21 +79,61 @@
ASSERT_EQ(3370318, lib_global_protected_get_serial());
}
-TEST(dl, exec_linker) {
#if defined(__BIONIC__)
#if defined(__LP64__)
static constexpr const char* kPathToLinker = "/system/bin/linker64";
#else
static constexpr const char* kPathToLinker = "/system/bin/linker";
#endif
+#endif
+
+TEST(dl, exec_linker) {
+#if defined(__BIONIC__)
+ std::string usage_prefix = std::string("Usage: ") + kPathToLinker;
ExecTestHelper eth;
- std::string expected_output = std::string("This is ") + kPathToLinker +
- ", the helper program for dynamic executables.\n";
- eth.SetArgs( { kPathToLinker, nullptr });
+ eth.SetArgs({ kPathToLinker, nullptr });
+ eth.Run([&]() { execve(kPathToLinker, eth.GetArgs(), eth.GetEnv()); }, 0, nullptr);
+ ASSERT_EQ(0u, eth.GetOutput().find(usage_prefix)) << "Test output:\n" << eth.GetOutput();
+#endif
+}
+
+TEST(dl, exec_linker_load_file) {
+#if defined(__BIONIC__)
+ std::string helper = GetTestlibRoot() +
+ "/exec_linker_helper/exec_linker_helper";
+ std::string expected_output =
+ "ctor: argc=1 argv[0]=" + helper + "\n" +
+ "main: argc=1 argv[0]=" + helper + "\n" +
+ "helper_func called\n";
+ ExecTestHelper eth;
+ eth.SetArgs({ kPathToLinker, helper.c_str(), nullptr });
eth.Run([&]() { execve(kPathToLinker, eth.GetArgs(), eth.GetEnv()); }, 0, expected_output.c_str());
#endif
}
+TEST(dl, exec_linker_load_from_zip) {
+#if defined(__BIONIC__)
+ std::string helper = GetTestlibRoot() +
+ "/libdlext_test_zip/libdlext_test_zip_zipaligned.zip!/libdir/exec_linker_helper";
+ std::string expected_output =
+ "ctor: argc=1 argv[0]=" + helper + "\n" +
+ "main: argc=1 argv[0]=" + helper + "\n" +
+ "helper_func called\n";
+ ExecTestHelper eth;
+ eth.SetArgs({ kPathToLinker, helper.c_str(), nullptr });
+ eth.Run([&]() { execve(kPathToLinker, eth.GetArgs(), eth.GetEnv()); }, 0, expected_output.c_str());
+#endif
+}
+
+TEST(dl, exec_linker_load_self) {
+#if defined(__BIONIC__)
+ std::string error_message = "error: linker cannot load itself\n";
+ ExecTestHelper eth;
+ eth.SetArgs({ kPathToLinker, kPathToLinker, nullptr });
+ eth.Run([&]() { execve(kPathToLinker, eth.GetArgs(), eth.GetEnv()); }, EXIT_FAILURE, error_message.c_str());
+#endif
+}
+
TEST(dl, preinit_system_calls) {
#if defined(__BIONIC__)
std::string helper = GetTestlibRoot() +
diff --git a/tests/libs/Android.bp b/tests/libs/Android.bp
index 2d35c51..5c4eb42 100644
--- a/tests/libs/Android.bp
+++ b/tests/libs/Android.bp
@@ -852,3 +852,19 @@
defaults: ["bionic_testlib_defaults"],
srcs: ["ld_config_test_helper_lib3.cpp"],
}
+
+cc_test {
+ name: "exec_linker_helper",
+ host_supported: false,
+ defaults: ["bionic_testlib_defaults"],
+ srcs: ["exec_linker_helper.cpp"],
+ shared_libs: ["exec_linker_helper_lib"],
+ ldflags: ["-Wl,--rpath,${ORIGIN}/.."],
+}
+
+cc_test_library {
+ name: "exec_linker_helper_lib",
+ host_supported: false,
+ defaults: ["bionic_testlib_defaults"],
+ srcs: ["exec_linker_helper_lib.cpp"],
+}
diff --git a/tests/libs/Android.build.dlext_testzip.mk b/tests/libs/Android.build.dlext_testzip.mk
index 62ed4c7..19fd64b 100644
--- a/tests/libs/Android.build.dlext_testzip.mk
+++ b/tests/libs/Android.build.dlext_testzip.mk
@@ -32,7 +32,9 @@
my_shared_libs := \
$(call intermediates-dir-for,SHARED_LIBRARIES,libdlext_test_zip,,,$(bionic_2nd_arch_prefix))/libdlext_test_zip.so \
- $(call intermediates-dir-for,SHARED_LIBRARIES,libatest_simple_zip,,,$(bionic_2nd_arch_prefix))/libatest_simple_zip.so
+ $(call intermediates-dir-for,SHARED_LIBRARIES,libatest_simple_zip,,,$(bionic_2nd_arch_prefix))/libatest_simple_zip.so \
+ $(call intermediates-dir-for,NATIVE_TESTS,exec_linker_helper,,,$(bionic_2nd_arch_prefix))/exec_linker_helper \
+ $(call intermediates-dir-for,SHARED_LIBRARIES,exec_linker_helper_lib,,,$(bionic_2nd_arch_prefix))/exec_linker_helper_lib.so
$(LOCAL_BUILT_MODULE): PRIVATE_SHARED_LIBS := $(my_shared_libs)
$(LOCAL_BUILT_MODULE): $(my_shared_libs) $(BIONIC_TESTS_ZIPALIGN)
diff --git a/tests/libs/exec_linker_helper.cpp b/tests/libs/exec_linker_helper.cpp
new file mode 100644
index 0000000..01a61e0
--- /dev/null
+++ b/tests/libs/exec_linker_helper.cpp
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <stdio.h>
+
+extern "C" void _start();
+const char* helper_func();
+
+__attribute__((constructor))
+static void ctor(int argc, char* argv[]) {
+ printf("ctor: argc=%d argv[0]=%s\n", argc, argv[0]);
+}
+
+int main(int argc, char* argv[]) {
+ printf("main: argc=%d argv[0]=%s\n", argc, argv[0]);
+ printf("%s\n", helper_func());
+ return 0;
+}
diff --git a/tests/libs/exec_linker_helper_lib.cpp b/tests/libs/exec_linker_helper_lib.cpp
new file mode 100644
index 0000000..b46f482
--- /dev/null
+++ b/tests/libs/exec_linker_helper_lib.cpp
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2018 The Android Open Source Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+// Verify that the linker can find exec_linker_helper_lib.so using the
+// executable's $ORIGIN runpath, even when the executable is inside a zip file.
+
+const char* helper_func() {
+ return "helper_func called";
+}
diff --git a/tests/utils.h b/tests/utils.h
index f07bd58..c8656dc 100644
--- a/tests/utils.h
+++ b/tests/utils.h
@@ -184,6 +184,9 @@
char** GetEnv() {
return const_cast<char**>(env_.data());
}
+ const std::string& GetOutput() {
+ return output_;
+ }
void SetArgs(const std::vector<const char*>& args) {
args_ = args;
@@ -212,24 +215,25 @@
// Parent.
close(fds[1]);
- std::string output;
+ output_.clear();
char buf[BUFSIZ];
ssize_t bytes_read;
while ((bytes_read = TEMP_FAILURE_RETRY(read(fds[0], buf, sizeof(buf)))) > 0) {
- output.append(buf, bytes_read);
+ output_.append(buf, bytes_read);
}
close(fds[0]);
- std::string error_msg("Test output:\n" + output);
+ std::string error_msg("Test output:\n" + output_);
AssertChildExited(pid, expected_exit_status, &error_msg);
if (expected_output != nullptr) {
- ASSERT_EQ(expected_output, output);
+ ASSERT_EQ(expected_output, output_);
}
}
private:
std::vector<const char*> args_;
std::vector<const char*> env_;
+ std::string output_;
};
#endif