From 19b669b00325bcbab4679c4e57c5d8d95f54decb Mon Sep 17 00:00:00 2001 From: Dimitry Ivanov Date: Mon, 9 May 2016 17:37:39 -0700 Subject: [PATCH] Remove linker-namespace functions from the header They are intended for platform use only and we shouldn't have them in the public header file. Bug: http://b/28174921 Change-Id: Ib9b3d0fa9442cfa2e784a693ad567d1444d774e5 (cherry picked from commit 41fd29532b52bb66e3e1f4620053713fd0299f6e) --- libc/include/android/dlext.h | 66 +------------------------------ linker/linker.h | 26 +++++++++++++ tests/dlext_private.h | 92 ++++++++++++++++++++++++++++++++++++++++++++ tests/dlext_test.cpp | 3 +- 4 files changed, 120 insertions(+), 67 deletions(-) create mode 100644 tests/dlext_private.h diff --git a/libc/include/android/dlext.h b/libc/include/android/dlext.h index d5ec38690..aa36f1ecb 100644 --- a/libc/include/android/dlext.h +++ b/libc/include/android/dlext.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2014 The Android Open Source Project - + * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at @@ -130,70 +130,6 @@ typedef struct { extern void* android_dlopen_ext(const char* filename, int flag, const android_dlextinfo* extinfo); -/* - * Initializes public and anonymous namespaces. The public_ns_sonames is the list of sonames - * to be included into public namespace separated by colon. Example: "libc.so:libm.so:libdl.so". - * The libraries in this list should be loaded prior to this call. - * - * The anon_ns_library_path is the search path for anonymous namespace. The anonymous namespace - * is used in the case when linker cannot identify the caller of dlopen/dlsym. This happens - * for the code not loaded by dynamic linker; for example calls from the mono-compiled code. - */ -extern bool android_init_namespaces(const char* public_ns_sonames, - const char* anon_ns_library_path); - - -enum { - /* A regular namespace is the namespace with a custom search path that does - * not impose any restrictions on the location of native libraries. - */ - ANDROID_NAMESPACE_TYPE_REGULAR = 0, - - /* An isolated namespace requires all the libraries to be on the search path - * or under permitted_when_isolated_path. The search path is the union of - * ld_library_path and default_library_path. - */ - ANDROID_NAMESPACE_TYPE_ISOLATED = 1, - - /* The shared namespace clones the list of libraries of the caller namespace upon creation - * which means that they are shared between namespaces - the caller namespace and the new one - * will use the same copy of a library if it was loaded prior to android_create_namespace call. - * - * Note that libraries loaded after the namespace is created will not be shared. - * - * Shared namespaces can be isolated or regular. Note that they do not inherit the search path nor - * permitted_path from the caller's namespace. - */ - ANDROID_NAMESPACE_TYPE_SHARED = 2, - ANDROID_NAMESPACE_TYPE_SHARED_ISOLATED = ANDROID_NAMESPACE_TYPE_SHARED | - ANDROID_NAMESPACE_TYPE_ISOLATED, -}; - -/* - * Creates new linker namespace. - * ld_library_path and default_library_path represent the search path - * for the libraries in the namespace. - * - * The libraries in the namespace are searched by folowing order: - * 1. ld_library_path (Think of this as namespace-local LD_LIBRARY_PATH) - * 2. In directories specified by DT_RUNPATH of the "needed by" binary. - * 3. deault_library_path (This of this as namespace-local default library path) - * - * When type is ANDROID_NAMESPACE_TYPE_ISOLATED the resulting namespace requires all of - * the libraries to be on the search path or under the permitted_when_isolated_path; - * the search_path is ld_library_path:default_library_path. Note that the - * permitted_when_isolated_path path is not part of the search_path and - * does not affect the search order. It is a way to allow loading libraries from specific - * locations when using absolute path. - * If a library or any of its dependencies are outside of the permitted_when_isolated_path - * and search_path, and it is not part of the public namespace dlopen will fail. - */ -extern struct android_namespace_t* android_create_namespace(const char* name, - const char* ld_library_path, - const char* default_library_path, - uint64_t type, - const char* permitted_when_isolated_path); - __END_DECLS #endif /* __ANDROID_DLEXT_H__ */ diff --git a/linker/linker.h b/linker/linker.h index a776525f8..3e6fa88ca 100644 --- a/linker/linker.h +++ b/linker/linker.h @@ -468,6 +468,32 @@ size_t linker_get_error_buffer_size(); void set_application_target_sdk_version(uint32_t target); uint32_t get_application_target_sdk_version(); +enum { + /* A regular namespace is the namespace with a custom search path that does + * not impose any restrictions on the location of native libraries. + */ + ANDROID_NAMESPACE_TYPE_REGULAR = 0, + + /* An isolated namespace requires all the libraries to be on the search path + * or under permitted_when_isolated_path. The search path is the union of + * ld_library_path and default_library_path. + */ + ANDROID_NAMESPACE_TYPE_ISOLATED = 1, + + /* The shared namespace clones the list of libraries of the caller namespace upon creation + * which means that they are shared between namespaces - the caller namespace and the new one + * will use the same copy of a library if it was loaded prior to android_create_namespace call. + * + * Note that libraries loaded after the namespace is created will not be shared. + * + * Shared namespaces can be isolated or regular. Note that they do not inherit the search path nor + * permitted_path from the caller's namespace. + */ + ANDROID_NAMESPACE_TYPE_SHARED = 2, + ANDROID_NAMESPACE_TYPE_SHARED_ISOLATED = ANDROID_NAMESPACE_TYPE_SHARED | + ANDROID_NAMESPACE_TYPE_ISOLATED, +}; + bool init_namespaces(const char* public_ns_sonames, const char* anon_ns_library_path); android_namespace_t* create_namespace(const void* caller_addr, const char* name, const char* ld_library_path, const char* default_library_path, diff --git a/tests/dlext_private.h b/tests/dlext_private.h new file mode 100644 index 000000000..8eb86ca48 --- /dev/null +++ b/tests/dlext_private.h @@ -0,0 +1,92 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef __ANDROID_DLEXT_NAMESPACES_H__ +#define __ANDROID_DLEXT_NAMESPACES_H__ + +#include + +__BEGIN_DECLS + +/* + * Initializes public and anonymous namespaces. The public_ns_sonames is the list of sonames + * to be included into public namespace separated by colon. Example: "libc.so:libm.so:libdl.so". + * The libraries in this list should be loaded prior to this call. + * + * The anon_ns_library_path is the search path for anonymous namespace. The anonymous namespace + * is used in the case when linker cannot identify the caller of dlopen/dlsym. This happens + * for the code not loaded by dynamic linker; for example calls from the mono-compiled code. + */ +extern bool android_init_namespaces(const char* public_ns_sonames, + const char* anon_ns_library_path); + + +enum { + /* A regular namespace is the namespace with a custom search path that does + * not impose any restrictions on the location of native libraries. + */ + ANDROID_NAMESPACE_TYPE_REGULAR = 0, + + /* An isolated namespace requires all the libraries to be on the search path + * or under permitted_when_isolated_path. The search path is the union of + * ld_library_path and default_library_path. + */ + ANDROID_NAMESPACE_TYPE_ISOLATED = 1, + + /* The shared namespace clones the list of libraries of the caller namespace upon creation + * which means that they are shared between namespaces - the caller namespace and the new one + * will use the same copy of a library if it was loaded prior to android_create_namespace call. + * + * Note that libraries loaded after the namespace is created will not be shared. + * + * Shared namespaces can be isolated or regular. Note that they do not inherit the search path nor + * permitted_path from the caller's namespace. + */ + ANDROID_NAMESPACE_TYPE_SHARED = 2, + ANDROID_NAMESPACE_TYPE_SHARED_ISOLATED = ANDROID_NAMESPACE_TYPE_SHARED | + ANDROID_NAMESPACE_TYPE_ISOLATED, +}; + +/* + * Creates new linker namespace. + * ld_library_path and default_library_path represent the search path + * for the libraries in the namespace. + * + * The libraries in the namespace are searched by folowing order: + * 1. ld_library_path (Think of this as namespace-local LD_LIBRARY_PATH) + * 2. In directories specified by DT_RUNPATH of the "needed by" binary. + * 3. deault_library_path (This of this as namespace-local default library path) + * + * When type is ANDROID_NAMESPACE_TYPE_ISOLATED the resulting namespace requires all of + * the libraries to be on the search path or under the permitted_when_isolated_path; + * the search_path is ld_library_path:default_library_path. Note that the + * permitted_when_isolated_path path is not part of the search_path and + * does not affect the search order. It is a way to allow loading libraries from specific + * locations when using absolute path. + * If a library or any of its dependencies are outside of the permitted_when_isolated_path + * and search_path, and it is not part of the public namespace dlopen will fail. + */ +extern struct android_namespace_t* android_create_namespace(const char* name, + const char* ld_library_path, + const char* default_library_path, + uint64_t type, + const char* permitted_when_isolated_path); + +extern void android_set_application_target_sdk_version(uint32_t target); + +__END_DECLS + +#endif /* __ANDROID_DLEXT_NAMESPACES_H__ */ diff --git a/tests/dlext_test.cpp b/tests/dlext_test.cpp index 87e5dbc09..205ad410f 100644 --- a/tests/dlext_test.cpp +++ b/tests/dlext_test.cpp @@ -34,6 +34,7 @@ #include "TemporaryFile.h" #include "utils.h" +#include "dlext_private.h" #define ASSERT_DL_NOTNULL(ptr) \ ASSERT_TRUE(ptr != nullptr) << "dlerror: " << dlerror() @@ -739,8 +740,6 @@ TEST(dlext, ns_smoke) { dlclose(handle2); } -extern "C" void android_set_application_target_sdk_version(uint32_t target); - TEST(dlext, ns_isolated) { static const char* root_lib = "libnstest_root_not_isolated.so"; std::string path = std::string("libc.so:libc++.so:libdl.so:libm.so:") + g_public_lib; -- 2.11.0