diff options
author | Florian Weimer <fweimer@redhat.com> | 2016-05-11 11:40:44 +0200 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2016-11-12 00:44:31 -0500 |
commit | 5237dbe70306a55036334a4dbf3b7abdff0c8877 (patch) | |
tree | 931568934b1f1e8ba9682de9d58dff80d8768f56 | |
parent | be3ad4ee1b3481d31741415efc040cca72de26c2 (diff) | |
download | glibc-5237dbe70306a55036334a4dbf3b7abdff0c8877.tar.gz glibc-5237dbe70306a55036334a4dbf3b7abdff0c8877.tar.xz glibc-5237dbe70306a55036334a4dbf3b7abdff0c8877.zip |
Revert "Report dlsym, dlvsym lookup errors using dlerror [BZ #19509]"
This reverts commits 80f87443eed17838fe453f1f5406ccf5d3698c25 and a824d609581d5ee7544aabcbbc70e8da44b2b5b6. See bug 20069. We can revisit this change once there has been a GCC release with a fix for Address Sanitizer. (cherry picked from commit 24e2b1cede1952d7d4411a3cafd25dd8593dab9f)
-rw-r--r-- | elf/Makefile | 4 | ||||
-rw-r--r-- | elf/dl-lookup.c | 1 | ||||
-rw-r--r-- | elf/tst-dlsym-error.c | 114 |
3 files changed, 2 insertions, 117 deletions
diff --git a/elf/Makefile b/elf/Makefile index cab22d7793..bc2dd12fcf 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -149,7 +149,7 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \ tst-nodelete) \ tst-initorder tst-initorder2 tst-relsort1 tst-null-argv \ tst-ptrguard1 tst-tlsalign tst-tlsalign-extern tst-nodelete-opened \ - tst-nodelete2 tst-audit11 tst-audit12 tst-dlsym-error + tst-nodelete2 tst-audit11 tst-audit12 # reldep9 ifeq ($(build-hardcoded-path-in-tests),yes) tests += tst-dlopen-aout @@ -1257,5 +1257,3 @@ $(objpfx)tst-prelink-cmp.out: tst-prelink.exp \ $(objpfx)tst-ldconfig-X.out : tst-ldconfig-X.sh $(objpfx)ldconfig $(SHELL) $< '$(common-objpfx)' '$(test-wrapper)' '$(test-wrapper-env)' > $@; \ $(evaluate-test) - -$(objpfx)tst-dlsym-error: $(libdl) diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c index 6d299c1097..f577759a9d 100644 --- a/elf/dl-lookup.c +++ b/elf/dl-lookup.c @@ -858,6 +858,7 @@ _dl_lookup_symbol_x (const char *undef_name, struct link_map *undef_map, if (__glibc_unlikely (current_value.s == NULL)) { if ((*ref == NULL || ELFW(ST_BIND) ((*ref)->st_info) != STB_WEAK) + && skip_map == NULL && !(GLRO(dl_debug_mask) & DL_DEBUG_UNUSED)) { /* We could find no value for a strong reference. */ diff --git a/elf/tst-dlsym-error.c b/elf/tst-dlsym-error.c deleted file mode 100644 index fb084c510c..0000000000 --- a/elf/tst-dlsym-error.c +++ /dev/null @@ -1,114 +0,0 @@ -/* Test error reporting for dlsym, dlvsym failures. - Copyright (C) 2016 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - <http://www.gnu.org/licenses/>. */ - -#include <dlfcn.h> -#include <gnu/lib-names.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - -/* Used to disambiguate symbol names. */ -static int counter; - -static void -test_one (void *handle, const char *name, void *(func) (void *, const char *), - const char *suffix) -{ - ++counter; - char symbol[32]; - snprintf (symbol, sizeof (symbol), "no_such_symbol_%d", counter); - char *expected_message; - if (asprintf (&expected_message, ": undefined symbol: %s%s", - symbol, suffix) < 0) - { - printf ("error: asprintf: %m\n"); - abort (); - } - - void *addr = func (handle, symbol); - if (addr != NULL) - { - printf ("error: %s: found symbol \"no_such_symbol\"\n", name); - abort (); - } - const char *message = dlerror (); - if (message == NULL) - { - printf ("error: %s: missing error message\n", name); - abort (); - } - const char *message_without_path = strchrnul (message, ':'); - if (strcmp (message_without_path, expected_message) != 0) - { - printf ("error: %s: unexpected error message: %s\n", name, message); - abort (); - } - free (expected_message); - - message = dlerror (); - if (message != NULL) - { - printf ("error: %s: unexpected error message: %s\n", name, message); - abort (); - } -} - -static void -test_handles (const char *name, void *(func) (void *, const char *), - const char *suffix) -{ - test_one (RTLD_DEFAULT, name, func, suffix); - test_one (RTLD_NEXT, name, func, suffix); - - void *handle = dlopen (LIBC_SO, RTLD_LAZY); - if (handle == NULL) - { - printf ("error: cannot dlopen %s: %s\n", LIBC_SO, dlerror ()); - abort (); - } - test_one (handle, name, func, suffix); - dlclose (handle); -} - -static void * -dlvsym_no_such_version (void *handle, const char *name) -{ - return dlvsym (handle, name, "NO_SUCH_VERSION"); -} - -static void * -dlvsym_glibc_private (void *handle, const char *name) -{ - return dlvsym (handle, name, "GLIBC_PRIVATE"); -} - -static int -do_test (void) -{ - test_handles ("dlsym", dlsym, ""); - test_handles ("dlvsym", dlvsym_no_such_version, - ", version NO_SUCH_VERSION"); - test_handles ("dlvsym", dlvsym_glibc_private, - ", version GLIBC_PRIVATE"); - - return 0; -} - - -#define TEST_FUNCTION do_test () -#include "../test-skeleton.c" |