diff options
author | Dmitriy Ivanov <dimitry@google.com> | 2014-09-09 10:21:42 -0700 |
---|---|---|
committer | Dmitriy Ivanov <dimitry@google.com> | 2014-10-01 16:04:58 -0700 |
commit | 7d971ec14b80cac442aeea8d88e9eb2e3ab6f214 (patch) | |
tree | a6c49cf522ec4cb5bc43edfbed24fa1dc209ef6b /tests | |
parent | f4cb6313645ef65cc0eea0a439e51b6788cd3439 (diff) | |
download | bionic-7d971ec14b80cac442aeea8d88e9eb2e3ab6f214.zip bionic-7d971ec14b80cac442aeea8d88e9eb2e3ab6f214.tar.gz bionic-7d971ec14b80cac442aeea8d88e9eb2e3ab6f214.tar.bz2 |
Fix unload of recursively linked library
Expanded test for recursive libs. Fixed bug with unnecessary
soinfo_free of already loaded library.
(cherry picked from commit a6ac54a215d6b64f5cc5a59b66c1dbfbb41ea9f5)
Change-Id: I6907c723d9fbdf6b2777f3f236b1e29b0843edd6
Diffstat (limited to 'tests')
-rw-r--r-- | tests/dlfcn_test.cpp | 13 | ||||
-rw-r--r-- | tests/libs/Android.mk | 10 | ||||
-rw-r--r-- | tests/libs/dlopen_testlib_invalid.cpp | 24 |
3 files changed, 41 insertions, 6 deletions
diff --git a/tests/dlfcn_test.cpp b/tests/dlfcn_test.cpp index ea02c1a..756f2ff 100644 --- a/tests/dlfcn_test.cpp +++ b/tests/dlfcn_test.cpp @@ -207,8 +207,19 @@ TEST(dlfcn, dlopen_check_order) { // libtest_with_dependency_loop_a.so TEST(dlfcn, dlopen_check_loop) { void* handle = dlopen("libtest_with_dependency_loop.so", RTLD_NOW); - ASSERT_TRUE(handle == NULL); + ASSERT_TRUE(handle == nullptr); ASSERT_STREQ("dlopen failed: recursive link to \"libtest_with_dependency_loop_a.so\"", dlerror()); + // This symbol should never be exposed + void* f = dlsym(RTLD_DEFAULT, "dlopen_test_invalid_function"); + ASSERT_TRUE(f == nullptr); + ASSERT_SUBSTR("undefined symbol: dlopen_test_invalid_function", dlerror()); + + // dlopen second time to make sure that the library wasn't loaded even though dlopen returned null. + // This may happen if during cleanup the root library or one of the depended libs were not removed + // from soinfo list. + handle = dlopen("libtest_with_dependency_loop.so", RTLD_NOW | RTLD_NOLOAD); + ASSERT_TRUE(handle == nullptr); + ASSERT_STREQ("dlopen failed: library \"libtest_with_dependency_loop.so\" wasn't loaded and RTLD_NOLOAD prevented it", dlerror()); } TEST(dlfcn, dlopen_failure) { diff --git a/tests/libs/Android.mk b/tests/libs/Android.mk index 1004b74..548dce3 100644 --- a/tests/libs/Android.mk +++ b/tests/libs/Android.mk @@ -195,7 +195,7 @@ include $(TEST_PATH)/Android.build.mk # # libtest_with_dependency_loop -> a -> b -> c -> a # ----------------------------------------------------------------------------- -libtest_with_dependency_loop_src_files := empty.cpp +libtest_with_dependency_loop_src_files := dlopen_testlib_invalid.cpp libtest_with_dependency_loop_shared_libraries := \ libtest_with_dependency_loop_a @@ -208,7 +208,7 @@ include $(TEST_PATH)/Android.build.mk # ----------------------------------------------------------------------------- # libtest_with_dependency_loop_a.so # ----------------------------------------------------------------------------- -libtest_with_dependency_loop_a_src_files := empty.cpp +libtest_with_dependency_loop_a_src_files := dlopen_testlib_invalid.cpp libtest_with_dependency_loop_a_shared_libraries := \ libtest_with_dependency_loop_b_tmp @@ -223,7 +223,7 @@ include $(TEST_PATH)/Android.build.mk # # this is temporary placeholder - will be removed # ----------------------------------------------------------------------------- -libtest_with_dependency_loop_b_tmp_src_files := empty.cpp +libtest_with_dependency_loop_b_tmp_src_files := dlopen_testlib_invalid.cpp libtest_with_dependency_loop_b_tmp_ldflags := -Wl,-soname=libtest_with_dependency_loop_b.so module := libtest_with_dependency_loop_b_tmp @@ -234,7 +234,7 @@ include $(TEST_PATH)/Android.build.mk # ----------------------------------------------------------------------------- # libtest_with_dependency_loop_b.so # ----------------------------------------------------------------------------- -libtest_with_dependency_loop_b_src_files := empty.cpp +libtest_with_dependency_loop_b_src_files := dlopen_testlib_invalid.cpp libtest_with_dependency_loop_b_shared_libraries := libtest_with_dependency_loop_c module := libtest_with_dependency_loop_b @@ -245,7 +245,7 @@ include $(TEST_PATH)/Android.build.mk # ----------------------------------------------------------------------------- # libtest_with_dependency_loop_c.so # ----------------------------------------------------------------------------- -libtest_with_dependency_loop_c_src_files := empty.cpp +libtest_with_dependency_loop_c_src_files := dlopen_testlib_invalid.cpp libtest_with_dependency_loop_c_shared_libraries := \ libtest_with_dependency_loop_a diff --git a/tests/libs/dlopen_testlib_invalid.cpp b/tests/libs/dlopen_testlib_invalid.cpp new file mode 100644 index 0000000..f2039c6 --- /dev/null +++ b/tests/libs/dlopen_testlib_invalid.cpp @@ -0,0 +1,24 @@ +/* + * 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 + * + * 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. + */ + +#include <stdlib.h> + +// This file is used for libraries that are not supposed to +// be successfully loaded/linked - therefore, this function should +// not be visible via dlsym - (we are going to use this fact in tests) +extern "C" int dlopen_test_invalid_function() { + abort(); +} |