Merge tag 'android-security-10.0.0_r53' into int/10/fp2
Android security 10.0.0 release 53
* tag 'android-security-10.0.0_r53':
Revert "Allow dlopen("/system/lib/<soname>") for pre-Q"
No ifunc for strcmp and strlen
Merge "Revert "Arm32 dynamic function dispatch"" am: 7562ef394d am: 740d9b50ea am: d978da5ba0
Revert "bionic: Allocate a shadow call stack for each thread."
Revert system seccomp filter changes
Change-Id: I8342e56c5ff8c0240fa46bfada201549b6834bd2
diff --git a/linker/linker.cpp b/linker/linker.cpp
index b59df73..324f3ef 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -1162,6 +1162,13 @@
}
}
+#if !defined(__ANDROID_APEX__)
+ if (fd == -1) {
+ std::vector<std::string> bootstrap_paths = { std::string(kSystemLibDir) + "/bootstrap" };
+ fd = open_library_on_paths(zip_archive_cache, name, file_offset, bootstrap_paths, realpath);
+ }
+#endif
+
if (fd == -1) {
fd = open_library_on_paths(zip_archive_cache, name, file_offset, ns->get_default_library_paths(), realpath);
}
diff --git a/tests/dlfcn_test.cpp b/tests/dlfcn_test.cpp
index f3be988..7ff553d 100644
--- a/tests/dlfcn_test.cpp
+++ b/tests/dlfcn_test.cpp
@@ -999,6 +999,7 @@
#error "Unknown architecture"
#endif
#define PATH_TO_LIBC PATH_TO_SYSTEM_LIB "libc.so"
+#define PATH_TO_BOOTSTRAP_LIBC PATH_TO_SYSTEM_LIB "bootstrap/libc.so"
#define ALTERNATE_PATH_TO_LIBC ALTERNATE_PATH_TO_SYSTEM_LIB "libc.so"
TEST(dlfcn, dladdr_libc) {
@@ -1018,6 +1019,9 @@
sizeof(ALTERNATE_PATH_TO_SYSTEM_LIB) - 1) == 0) {
// Platform with emulated architecture. Symlink on ARC++.
ASSERT_TRUE(realpath(ALTERNATE_PATH_TO_LIBC, libc_realpath) == libc_realpath);
+ } else if (strncmp(PATH_TO_BOOTSTRAP_LIBC, info.dli_fname,
+ sizeof(PATH_TO_BOOTSTRAP_LIBC) - 1) == 0) {
+ ASSERT_TRUE(realpath(PATH_TO_BOOTSTRAP_LIBC, libc_realpath) == libc_realpath);
} else {
// /system/lib is symlink when this test is executed on host.
ASSERT_TRUE(realpath(PATH_TO_LIBC, libc_realpath) == libc_realpath);