From: Florian Weimer Date: Wed, 11 May 2016 09:40:44 +0000 (+0200) Subject: Revert "Report dlsym, dlvsym lookup errors using dlerror [BZ #19509]" X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24e2b1cede1952d7d4411a3cafd25dd8593dab9f;p=thirdparty%2Fglibc.git 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. --- diff --git a/ChangeLog b/ChangeLog index 4764955b4ae..164f80c8421 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,16 +1,3 @@ -2016-03-31 Adhemerval Zanella - - * elf/tst-dlsym-error.c: Include for strchrnul. - -2016-03-31 Florian Weimer - - [BZ #19509] - * elf/dl-lookup.c (_dl_lookup_symbol_x): Report error even if - skip_map != NULL. - * elf/tst-dlsym-error.c: New file. - * elf/Makefile (tests): Add tst-dlsym-error. - (tst-dlsym-error): Link against libdl. - 2016-03-07 Florian Weimer [BZ #19610] diff --git a/elf/Makefile b/elf/Makefile index c3dc451fffc..ae99f65cda7 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 6d299c1097c..f577759a9d3 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 fb084c510c7..00000000000 --- 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 - . */ - -#include -#include -#include -#include -#include - -/* 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"