From patchwork Mon May 11 16:42:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 38951 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 12280389367D; Mon, 11 May 2020 16:42:41 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from albireo.enyo.de (albireo.enyo.de [37.24.231.21]) by sourceware.org (Postfix) with ESMTPS id EF491389367A for ; Mon, 11 May 2020 16:42:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org EF491389367A Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=deneb.enyo.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=fw@deneb.enyo.de Received: from [172.17.203.2] (helo=deneb.enyo.de) by albireo.enyo.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) id 1jYBVk-0008IK-Ua for libc-alpha@sourceware.org; Mon, 11 May 2020 16:42:36 +0000 Received: from fw by deneb.enyo.de with local (Exim 4.92) (envelope-from ) id 1jYBVk-0000DD-T5 for libc-alpha@sourceware.org; Mon, 11 May 2020 18:42:36 +0200 From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH v2 1/3] ld.so: Turn tls_init_tp_called into global __rtld_tls_init_tp_called In-Reply-To: References: Message-Id: <91b48076cae9824c1b3711d809da61b890a51e8b.1589215037.git.fweimer@redhat.com> Date: Mon, 11 May 2020 18:42:36 +0200 MIME-Version: 1.0 X-Spam-Status: No, score=-13.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" This allows the rest of dynamic loader to check whether the TCB has been set up (and THREAD_GETMEM and THREAD_SETMEM will work). --- elf/rtld.c | 12 ++++++------ sysdeps/generic/ldsodefs.h | 3 +++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/elf/rtld.c b/elf/rtld.c index 5ccc3c2dbb..7ca286cbcc 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -733,7 +733,7 @@ match_version (const char *string, struct link_map *map) return 0; } -static bool tls_init_tp_called; +bool __rtld_tls_init_tp_called; static void * init_tls (void) @@ -799,7 +799,7 @@ cannot allocate TLS data structures for initial thread\n"); const char *lossage = TLS_INIT_TP (tcbp); if (__glibc_unlikely (lossage != NULL)) _dl_fatal_printf ("cannot set up thread-local storage: %s\n", lossage); - tls_init_tp_called = true; + __rtld_tls_init_tp_called = true; return tcbp; } @@ -1916,7 +1916,7 @@ ERROR: '%s': cannot process note segment.\n", _dl_argv[0]); an old kernel that can't perform TLS_INIT_TP, even if no TLS is ever used. Trying to do it lazily is too hairy to try when there could be multiple threads (from a non-TLS-using libpthread). */ - bool was_tls_init_tp_called = tls_init_tp_called; + bool was_tls_init_tp_called = __rtld_tls_init_tp_called; if (tcbp == NULL) tcbp = init_tls (); @@ -2267,7 +2267,7 @@ ERROR: '%s': cannot process note segment.\n", _dl_argv[0]); _dl_protect_relro (l); /* Add object to slot information data if necessasy. */ - if (l->l_tls_blocksize != 0 && tls_init_tp_called) + if (l->l_tls_blocksize != 0 && __rtld_tls_init_tp_called) _dl_add_to_slotinfo (l, true); } } @@ -2312,7 +2312,7 @@ ERROR: '%s': cannot process note segment.\n", _dl_argv[0]); consider_profiling); /* Add object to slot information data if necessasy. */ - if (l->l_tls_blocksize != 0 && tls_init_tp_called) + if (l->l_tls_blocksize != 0 && __rtld_tls_init_tp_called) _dl_add_to_slotinfo (l, true); } rtld_timer_stop (&relocate_time, start); @@ -2338,7 +2338,7 @@ ERROR: '%s': cannot process note segment.\n", _dl_argv[0]); _dl_allocate_tls_init (tcbp); /* And finally install it for the main thread. */ - if (! tls_init_tp_called) + if (! __rtld_tls_init_tp_called) { const char *lossage = TLS_INIT_TP (tcbp); if (__glibc_unlikely (lossage != NULL)) diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index 5ff4a2831b..ef0e339c6b 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -1139,6 +1139,9 @@ extern void *_dl_allocate_tls_storage (void) attribute_hidden; extern void *_dl_allocate_tls_init (void *); rtld_hidden_proto (_dl_allocate_tls_init) +/* True if the TCB has been set up. */ +extern bool __rtld_tls_init_tp_called attribute_hidden; + /* Deallocate memory allocated with _dl_allocate_tls. */ extern void _dl_deallocate_tls (void *tcb, bool dealloc_tcb); rtld_hidden_proto (_dl_deallocate_tls) From patchwork Mon May 11 16:42:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 38952 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 68567389042A; Mon, 11 May 2020 16:42:46 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from albireo.enyo.de (albireo.enyo.de [37.24.231.21]) by sourceware.org (Postfix) with ESMTPS id 8654F385DC1F for ; Mon, 11 May 2020 16:42:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 8654F385DC1F Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=deneb.enyo.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=fw@deneb.enyo.de Received: from [172.17.203.2] (helo=deneb.enyo.de) by albireo.enyo.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) id 1jYBVr-0008Ip-Ey for libc-alpha@sourceware.org; Mon, 11 May 2020 16:42:43 +0000 Received: from fw by deneb.enyo.de with local (Exim 4.92) (envelope-from ) id 1jYBVr-0000Dt-CO for libc-alpha@sourceware.org; Mon, 11 May 2020 18:42:43 +0200 From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH v2 2/3] scripts/localplt.awk: Handle DT_JMPREL with empty PLT (for C-SKY) In-Reply-To: References: Message-Id: <3ae2924b53826ad94ea9cf06a7b43adab26f0bda.1589215037.git.fweimer@redhat.com> Date: Mon, 11 May 2020 18:42:43 +0200 MIME-Version: 1.0 X-Spam-Status: No, score=-13.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" On csky-linux-gnuabiv2, binutils 2.33 produces a DT_JMPREL entry for the dynamic loader if it does not contain any PLT relocations: Dynamic section at offset 0x1df48 contains 19 entries: Tag Type Name/Value 0x0000000e (SONAME) Library soname: [ld-linux-cskyv2-hf.so.1] 0x00000004 (HASH) 0xd4 0x6ffffef5 (GNU_HASH) 0x1a8 0x00000005 (STRTAB) 0x4ac 0x00000006 (SYMTAB) 0x28c 0x0000000a (STRSZ) 527 (bytes) 0x0000000b (SYMENT) 16 (bytes) 0x00000003 (PLTGOT) 0x1f000 0x00000002 (PLTRELSZ) 0 (bytes) 0x00000014 (PLTREL) RELA 0x00000017 (JMPREL) 0xaa4 0x00000007 (RELA) 0x75c 0x00000008 (RELASZ) 840 (bytes) 0x00000009 (RELAENT) 12 (bytes) 0x6ffffffc (VERDEF) 0x700 0x6ffffffd (VERDEFNUM) 3 0x6ffffff0 (VERSYM) 0x6bc 0x6ffffff9 (RELACOUNT) 68 0x00000000 (NULL) 0x0 This confuses the script: Unexpected output from check-localplt: …/elf/ld.so.jmprel: *** DT_JMPREL does not match any section's address This commit changes the script to record the DT_PLTRELSZ value and reject DT_JMPREL values not a section boundary only if DT_PLTRELSZ is present with a non-zero value. --- scripts/localplt.awk | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/scripts/localplt.awk b/scripts/localplt.awk index beaa342922..fe79ca01ab 100644 --- a/scripts/localplt.awk +++ b/scripts/localplt.awk @@ -4,17 +4,25 @@ # It writes "NAME: SYMBOL" for each PLT entry in NAME that refers to a # symbol defined in the same object. -BEGIN { result = 0 } +BEGIN { + result = 0; + pltrelsize = -1; +} FILENAME != lastfile { if (lastfile && jmprel_offset == 0 && rela_offset == 0 && rel_offset == 0) { print FILENAME ": *** failed to find expected output (readelf -WSdr)"; result = 2; } + if (pltrelsz > 0 && jmprel_offset == -1) { + print FILENAME ": Could not find section for DT_JMPREL"; + result = 2; + } lastfile = FILENAME; jmprel_offset = 0; rela_offset = 0; rel_offset = 0; + pltrelsz = -1; delete section_offset_by_address; } @@ -82,12 +90,16 @@ $2 == "(JMPREL)" { if (jmprel_addr in section_offset_by_address) { jmprel_offset = section_offset_by_address[jmprel_addr]; } else { - print FILENAME ": *** DT_JMPREL does not match any section's address"; - result = 2; + jmprel_offset = -1 } next } +$2 == "(PLTRELSZ)" { + pltrelsz = strtonum($3); + next +} + $2 == "(RELA)" { rela_addr = strtonum($3); if (rela_addr in section_offset_by_address) { From patchwork Mon May 11 16:42:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 38953 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C33543894405; Mon, 11 May 2020 16:43:00 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from albireo.enyo.de (albireo.enyo.de [37.24.231.21]) by sourceware.org (Postfix) with ESMTPS id CA71E385DC1F for ; Mon, 11 May 2020 16:42:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org CA71E385DC1F Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=deneb.enyo.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=fw@deneb.enyo.de Received: from [172.17.203.2] (helo=deneb.enyo.de) by albireo.enyo.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) id 1jYBVv-0008JF-PC for libc-alpha@sourceware.org; Mon, 11 May 2020 16:42:47 +0000 Received: from fw by deneb.enyo.de with local (Exim 4.92) (envelope-from ) id 1jYBVv-0000EY-NR for libc-alpha@sourceware.org; Mon, 11 May 2020 18:42:47 +0200 From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH v2 3/3] elf: Rework exception handling in the dynamic loader [BZ #25486] In-Reply-To: References: Message-Id: Date: Mon, 11 May 2020 18:42:47 +0200 MIME-Version: 1.0 X-Spam-Status: No, score=-13.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_SHORT, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" The old exception handling implementation used function interposition to replace the dynamic loader implementation (no TLS support) with the libc implementation (TLS support). This results in problems if the link order between the dynamic loader and libc is reversed (bug 25486). The new implementation moves the entire implementation of the exception handling functions back into the dynamic loader, using THREAD_GETMEM and THREAD_SETMEM for thread-local data support. These depends on Hurd support for these macros, added in commit b65a82e4e757c1e6cb7073916 ("hurd: Add THREAD_GET/SETMEM/_NC"). One small obstacle is that the exception handling facilities are used before the TCB has been set up, so a check is needed if the TCB is available. If not, a regular global variable is used to store the exception handling information. Also rename dl-error.c to dl-catch.c, to avoid confusion with the dlerror function. --- elf/Makefile | 6 +- elf/Versions | 6 - elf/{dl-error-skeleton.c => dl-catch.c} | 139 +++++++++--------- elf/dl-error-minimal.c | 23 --- elf/dl-error.c | 27 ---- nptl/descr.h | 3 + sysdeps/generic/ldsodefs.h | 8 +- sysdeps/generic/localplt.data | 5 - sysdeps/mach/hurd/i386/localplt.data | 9 +- sysdeps/mach/hurd/i386/tls.h | 3 + sysdeps/unix/sysv/linux/aarch64/localplt.data | 5 - sysdeps/unix/sysv/linux/alpha/localplt.data | 5 - sysdeps/unix/sysv/linux/arm/localplt.data | 5 - sysdeps/unix/sysv/linux/csky/localplt.data | 5 - sysdeps/unix/sysv/linux/hppa/localplt.data | 5 - sysdeps/unix/sysv/linux/i386/localplt.data | 5 - sysdeps/unix/sysv/linux/ia64/localplt.data | 5 - .../sysv/linux/m68k/coldfire/localplt.data | 5 - .../unix/sysv/linux/m68k/m680x0/localplt.data | 5 - .../unix/sysv/linux/microblaze/localplt.data | 5 - sysdeps/unix/sysv/linux/nios2/localplt.data | 5 - .../linux/powerpc/powerpc32/fpu/localplt.data | 5 - .../powerpc/powerpc32/nofpu/localplt.data | 5 - .../linux/powerpc/powerpc64/localplt.data | 5 - sysdeps/unix/sysv/linux/riscv/localplt.data | 5 - sysdeps/unix/sysv/linux/s390/localplt.data | 5 - sysdeps/unix/sysv/linux/sh/localplt.data | 5 - .../sysv/linux/sparc/sparc32/localplt.data | 5 - .../sysv/linux/sparc/sparc64/localplt.data | 5 - sysdeps/x86_64/localplt.data | 5 - 30 files changed, 90 insertions(+), 239 deletions(-) rename elf/{dl-error-skeleton.c => dl-catch.c} (80%) delete mode 100644 elf/dl-error-minimal.c delete mode 100644 elf/dl-error.c diff --git a/elf/Makefile b/elf/Makefile index 77da61ae64..9c443c7773 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -24,7 +24,7 @@ include ../Makeconfig headers = elf.h bits/elfclass.h link.h bits/link.h routines = $(all-dl-routines) dl-support dl-iteratephdr \ dl-addr dl-addr-obj enbl-secure dl-profstub \ - dl-origin dl-libc dl-sym dl-sysdep dl-error \ + dl-origin dl-libc dl-sym dl-sysdep \ dl-reloc-static-pie libc_early_init # The core dynamic linking functions are in libc for the static and @@ -34,7 +34,7 @@ dl-routines = $(addprefix dl-,load lookup object reloc deps hwcaps \ version profile tls origin scope \ execstack open close trampoline \ exception sort-maps lookup-direct \ - call-libc-early-init) + call-libc-early-init catch) ifeq (yes,$(use-ldconfig)) dl-routines += dl-cache endif @@ -59,7 +59,7 @@ elide-routines.os = $(all-dl-routines) dl-support enbl-secure dl-origin \ # ld.so uses those routines, plus some special stuff for being the program # interpreter and operating independent of libc. rtld-routines = rtld $(all-dl-routines) dl-sysdep dl-environ dl-minimal \ - dl-error-minimal dl-conflict + dl-conflict all-rtld-routines = $(rtld-routines) $(sysdep-rtld-routines) CFLAGS-dl-runtime.c += -fexceptions -fasynchronous-unwind-tables diff --git a/elf/Versions b/elf/Versions index 3be879c4ad..2388ac6579 100644 --- a/elf/Versions +++ b/elf/Versions @@ -27,10 +27,6 @@ libc { _dl_sym; _dl_vsym; __libc_dlclose; __libc_dlopen_mode; __libc_dlsym; __libc_dlvsym; __libc_early_init; - - # Internal error handling support. Interposes the functions in ld.so. - _dl_signal_exception; _dl_catch_exception; - _dl_signal_error; _dl_catch_error; } } @@ -69,8 +65,6 @@ ld { # Internal error handling support. _dl_exception_create; _dl_exception_create_format; _dl_exception_free; - - # Internal error handling support. Interposed by libc.so. _dl_signal_exception; _dl_catch_exception; _dl_signal_error; _dl_catch_error; diff --git a/elf/dl-error-skeleton.c b/elf/dl-catch.c similarity index 80% rename from elf/dl-error-skeleton.c rename to elf/dl-catch.c index c505c02adf..fe88a2a70e 100644 --- a/elf/dl-error-skeleton.c +++ b/elf/dl-catch.c @@ -1,4 +1,4 @@ -/* Template for error handling for runtime dynamic linker. +/* Exception handling in the dynamic linker. Copyright (C) 1995-2020 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -16,16 +16,6 @@ License along with the GNU C Library; if not, see . */ -/* The following macro needs to be defined before including this - skeleton file: - - DL_ERROR_BOOTSTRAP - - If 1, do not use TLS and implement _dl_signal_cerror and - _dl_receive_error. If 0, TLS is used, and the variants with - error callbacks are not provided. */ - - #include #include #include @@ -34,39 +24,50 @@ #include #include #include +#include /* This structure communicates state between _dl_catch_error and _dl_signal_error. */ -struct catch +struct rtld_catch { struct dl_exception *exception; /* The exception data is stored there. */ volatile int *errcode; /* Return value of _dl_signal_error. */ jmp_buf env; /* longjmp here on error. */ }; -/* Multiple threads at once can use the `_dl_catch_error' function. The - calls can come from `_dl_map_object_deps', `_dlerror_run', or from - any of the libc functionality which loads dynamic objects (NSS, iconv). - Therefore we have to be prepared to save the state in thread-local - memory. */ -#if !DL_ERROR_BOOTSTRAP -static __thread struct catch *catch_hook attribute_tls_model_ie; -#else -/* The version of this code in ld.so cannot use thread-local variables - and is used during bootstrap only. */ -static struct catch *catch_hook; +/* Multiple threads at once can use the `_dl_catch_error' function. + The calls can come from `_dl_map_object_deps', `_dlerror_run', or + from any of the libc functionality which loads dynamic objects + (NSS, iconv). Therefore we have to be prepared to save the state + in thread-local memory. We use THREAD_GETMEM and THREAD_SETMEM + instead of ELF TLS because it exception handling must work before + the TCB and ELF TLS have been set up. */ + +#if IS_IN (rtld) +static struct rtld_catch *rtld_catch_notls; #endif -#if DL_ERROR_BOOTSTRAP -/* This points to a function which is called when an continuable error is - received. Unlike the handling of `catch' this function may return. - The arguments will be the `errstring' and `objname'. +static struct rtld_catch * +get_catch (void) +{ +#if IS_IN (rtld) + if (!__rtld_tls_init_tp_called) + return rtld_catch_notls; + else +#endif + return THREAD_GETMEM (THREAD_SELF, rtld_catch); +} - Since this functionality is not used in normal programs (only in ld.so) - we do not care about multi-threaded programs here. We keep this as a - global variable. */ -static receiver_fct receiver; -#endif /* DL_ERROR_BOOTSTRAP */ +static void +set_catch (struct rtld_catch *catch) +{ +#if IS_IN (rtld) + if (!__rtld_tls_init_tp_called) + rtld_catch_notls = catch; + else +#endif + THREAD_SETMEM (THREAD_SELF, rtld_catch, catch); +} /* Lossage while resolving the program's own symbols is always fatal. */ static void @@ -89,7 +90,7 @@ void _dl_signal_exception (int errcode, struct dl_exception *exception, const char *occasion) { - struct catch *lcatch = catch_hook; + struct rtld_catch *lcatch = get_catch (); if (lcatch != NULL) { *lcatch->exception = *exception; @@ -101,13 +102,13 @@ _dl_signal_exception (int errcode, struct dl_exception *exception, else fatal_error (errcode, exception->objname, occasion, exception->errstring); } -libc_hidden_def (_dl_signal_exception) +rtld_hidden_def (_dl_signal_exception) void _dl_signal_error (int errcode, const char *objname, const char *occation, const char *errstring) { - struct catch *lcatch = catch_hook; + struct rtld_catch *lcatch = get_catch (); if (! errstring) errstring = N_("DYNAMIC LINKER BUG!!!"); @@ -123,10 +124,18 @@ _dl_signal_error (int errcode, const char *objname, const char *occation, else fatal_error (errcode, objname, occation, errstring); } -libc_hidden_def (_dl_signal_error) +rtld_hidden_def (_dl_signal_error) +#if IS_IN (rtld) +/* This points to a function which is called when an continuable error is + received. Unlike the handling of `catch' this function may return. + The arguments will be the `errstring' and `objname'. + + Since this functionality is not used in normal programs (only in ld.so) + we do not care about multi-threaded programs here. We keep this as a + global variable. */ +static receiver_fct receiver; -#if DL_ERROR_BOOTSTRAP void _dl_signal_cexception (int errcode, struct dl_exception *exception, const char *occasion) @@ -167,7 +176,23 @@ _dl_signal_cerror (int errcode, const char *objname, const char *occation, else _dl_signal_error (errcode, objname, occation, errstring); } -#endif /* DL_ERROR_BOOTSTRAP */ + +void +_dl_receive_error (receiver_fct fct, void (*operate) (void *), void *args) +{ + struct rtld_catch *old_catch = get_catch (); + receiver_fct old_receiver = receiver; + + /* Set the new values. */ + set_catch (NULL); + receiver = fct; + + (*operate) (args); + + set_catch (old_catch); + receiver = old_receiver; +} +#endif int _dl_catch_exception (struct dl_exception *exception, @@ -177,11 +202,11 @@ _dl_catch_exception (struct dl_exception *exception, Exceptions during operate (args) are fatal. */ if (exception == NULL) { - struct catch *const old = catch_hook; - catch_hook = NULL; + struct rtld_catch *old_catch = get_catch (); + set_catch (NULL); operate (args); /* If we get here, the operation was successful. */ - catch_hook = old; + set_catch (old_catch); return 0; } @@ -194,19 +219,19 @@ _dl_catch_exception (struct dl_exception *exception, in _dl_signal_error (before longjmp). */ volatile int errcode; - struct catch c; + struct rtld_catch c; /* Don't use an initializer since we don't need to clear C.env. */ c.exception = exception; c.errcode = &errcode; - struct catch *const old = catch_hook; - catch_hook = &c; + struct rtld_catch *old = get_catch (); + set_catch (&c); /* Do not save the signal mask. */ if (__builtin_expect (__sigsetjmp (c.env, 0), 0) == 0) { (*operate) (args); - catch_hook = old; + set_catch (old); *exception = (struct dl_exception) { NULL }; return 0; } @@ -214,10 +239,10 @@ _dl_catch_exception (struct dl_exception *exception, /* We get here only if we longjmp'd out of OPERATE. _dl_signal_exception has already stored values into *EXCEPTION. */ - catch_hook = old; + set_catch (old); return errcode; } -libc_hidden_def (_dl_catch_exception) +rtld_hidden_def (_dl_catch_exception) int _dl_catch_error (const char **objname, const char **errstring, @@ -230,22 +255,4 @@ _dl_catch_error (const char **objname, const char **errstring, *mallocedp = exception.message_buffer == exception.errstring; return errorcode; } -libc_hidden_def (_dl_catch_error) - -#if DL_ERROR_BOOTSTRAP -void -_dl_receive_error (receiver_fct fct, void (*operate) (void *), void *args) -{ - struct catch *old_catch = catch_hook; - receiver_fct old_receiver = receiver; - - /* Set the new values. */ - catch_hook = NULL; - receiver = fct; - - (*operate) (args); - - catch_hook = old_catch; - receiver = old_receiver; -} -#endif /* DL_ERROR_BOOTSTRAP */ +rtld_hidden_def (_dl_catch_error) diff --git a/elf/dl-error-minimal.c b/elf/dl-error-minimal.c deleted file mode 100644 index d5e83198ce..0000000000 --- a/elf/dl-error-minimal.c +++ /dev/null @@ -1,23 +0,0 @@ -/* Error handling for runtime dynamic linker, minimal version. - Copyright (C) 1995-2020 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 - . */ - -/* This version does lives in ld.so, does not use thread-local data - and supports _dl_signal_cerror and _dl_receive_error. */ - -#define DL_ERROR_BOOTSTRAP 1 -#include "dl-error-skeleton.c" diff --git a/elf/dl-error.c b/elf/dl-error.c deleted file mode 100644 index e91561b785..0000000000 --- a/elf/dl-error.c +++ /dev/null @@ -1,27 +0,0 @@ -/* Error handling for runtime dynamic linker, full version. - Copyright (C) 1995-2020 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 - . */ - -/* This implementation lives in libc.so because it uses thread-local - data, which is not available in ld.so. It interposes the version - in dl-error-minimal.c after ld.so bootstrap. - - The signal/catch mechanism is used by the audit framework, which - means that even in ld.so, not all errors are fatal. */ - -#define DL_ERROR_BOOTSTRAP 0 -#include "dl-error-skeleton.c" diff --git a/nptl/descr.h b/nptl/descr.h index e1c7db5473..f0dd0afb52 100644 --- a/nptl/descr.h +++ b/nptl/descr.h @@ -395,6 +395,9 @@ struct pthread masked.) */ sigset_t sigmask; + /* Used by the exception handling implementation in the dynamic loader. */ + struct rtld_catch *rtld_catch; + /* Indicates whether is a C11 thread created by thrd_creat. */ bool c11; diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index ef0e339c6b..dae5c2e8f4 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -815,13 +815,13 @@ rtld_hidden_proto (_dl_exception_free) void _dl_signal_exception (int errcode, struct dl_exception *, const char *occasion) __attribute__ ((__noreturn__)); -libc_hidden_proto (_dl_signal_exception) +rtld_hidden_proto (_dl_signal_exception) /* Like _dl_signal_exception, but creates the exception first. */ extern void _dl_signal_error (int errcode, const char *object, const char *occasion, const char *errstring) __attribute__ ((__noreturn__)); -libc_hidden_proto (_dl_signal_error) +rtld_hidden_proto (_dl_signal_error) /* Like _dl_signal_exception, but may return when called in the context of _dl_receive_error. This is only used during ld.so @@ -874,7 +874,7 @@ extern void _dl_receive_error (receiver_fct fct, void (*operate) (void *), extern int _dl_catch_error (const char **objname, const char **errstring, bool *mallocedp, void (*operate) (void *), void *args); -libc_hidden_proto (_dl_catch_error) +rtld_hidden_proto (_dl_catch_error) /* Call OPERATE (ARGS). If no error occurs, set *EXCEPTION to zero. Otherwise, store a copy of the raised exception in *EXCEPTION, @@ -883,7 +883,7 @@ libc_hidden_proto (_dl_catch_error) disabled (so that exceptions are fatal). */ int _dl_catch_exception (struct dl_exception *exception, void (*operate) (void *), void *args); -libc_hidden_proto (_dl_catch_exception) +rtld_hidden_proto (_dl_catch_exception) /* Open the shared object NAME and map in its segments. LOADER's DT_RPATH is used in searching for NAME. diff --git a/sysdeps/generic/localplt.data b/sysdeps/generic/localplt.data index e2083c0ce6..d2965199f3 100644 --- a/sysdeps/generic/localplt.data +++ b/sysdeps/generic/localplt.data @@ -7,8 +7,3 @@ libc.so: malloc libc.so: memalign libc.so: realloc libm.so: matherr -# The TLS-enabled version of these functions is interposed from libc.so. -ld.so: _dl_signal_error -ld.so: _dl_catch_error -ld.so: _dl_signal_exception -ld.so: _dl_catch_exception diff --git a/sysdeps/mach/hurd/i386/localplt.data b/sysdeps/mach/hurd/i386/localplt.data index 102323e64f..7731306b44 100644 --- a/sysdeps/mach/hurd/i386/localplt.data +++ b/sysdeps/mach/hurd/i386/localplt.data @@ -9,11 +9,6 @@ libc.so: malloc + REL R_386_GLOB_DAT libc.so: memalign + REL R_386_GLOB_DAT libc.so: realloc + REL R_386_GLOB_DAT libm.so: matherr + REL R_386_GLOB_DAT -# The TLS-enabled version of these functions is interposed from libc.so. -ld.so: _dl_signal_error + REL R_386_GLOB_DAT -ld.so: _dl_catch_error + REL R_386_GLOB_DAT -ld.so: _dl_signal_exception + REL R_386_GLOB_DAT -ld.so: _dl_catch_exception + REL R_386_GLOB_DAT # The dynamic linker has its own versions of basic functions for initial loading # of shared libraries. These need to be overriden by libc once loaded. ld.so: __open ? @@ -40,12 +35,16 @@ ld.so: __errno_location # functions above which do need a PLT. These are thus currently expected. ld.so: _dl_allocate_tls ld.so: _dl_allocate_tls_init +ld.so: _dl_catch_error +ld.so: _dl_catch_exception ld.so: _dl_exception_create ld.so: _dl_exception_create_format ld.so: _dl_exception_free ld.so: _dl_find_dso_for_object ld.so: _dl_init_first ld.so: _dl_mcount +ld.so: _dl_signal_error +ld.so: _dl_signal_exception ld.so: ___tls_get_addr ld.so: __tunable_get_val # diff --git a/sysdeps/mach/hurd/i386/tls.h b/sysdeps/mach/hurd/i386/tls.h index 0c2de054d8..9b2bdf8970 100644 --- a/sysdeps/mach/hurd/i386/tls.h +++ b/sysdeps/mach/hurd/i386/tls.h @@ -48,6 +48,9 @@ typedef struct compatible with the i386 Linux version. */ mach_port_t reply_port; /* This thread's reply port. */ struct hurd_sigstate *_hurd_sigstate; + + /* Used by the exception handling implementation in the dynamic loader. */ + struct rtld_catch *rtld_catch; } tcbhead_t; #endif diff --git a/sysdeps/unix/sysv/linux/aarch64/localplt.data b/sysdeps/unix/sysv/linux/aarch64/localplt.data index 56f362d3a7..ccd50d3861 100644 --- a/sysdeps/unix/sysv/linux/aarch64/localplt.data +++ b/sysdeps/unix/sysv/linux/aarch64/localplt.data @@ -9,8 +9,3 @@ libc.so: realloc libm.so: matherr # The dynamic loader needs __tls_get_addr for TLS. ld.so: __tls_get_addr -# The TLS-enabled version of these functions is interposed from libc.so. -ld.so: _dl_signal_error -ld.so: _dl_catch_error -ld.so: _dl_signal_exception -ld.so: _dl_catch_exception diff --git a/sysdeps/unix/sysv/linux/alpha/localplt.data b/sysdeps/unix/sysv/linux/alpha/localplt.data index 43f6fdaea1..fd460cbf79 100644 --- a/sysdeps/unix/sysv/linux/alpha/localplt.data +++ b/sysdeps/unix/sysv/linux/alpha/localplt.data @@ -26,8 +26,3 @@ libm.so: matherr + RELA R_ALPHA_GLOB_DAT libm.so: __atan2 # The dynamic loader needs __tls_get_addr for TLS. ld.so: __tls_get_addr ? -# The TLS-enabled version of these functions is interposed from libc.so. -ld.so: _dl_signal_error + RELA R_ALPHA_GLOB_DAT -ld.so: _dl_catch_error + RELA R_ALPHA_GLOB_DAT -ld.so: _dl_signal_exception + RELA R_ALPHA_GLOB_DAT -ld.so: _dl_catch_exception + RELA R_ALPHA_GLOB_DAT diff --git a/sysdeps/unix/sysv/linux/arm/localplt.data b/sysdeps/unix/sysv/linux/arm/localplt.data index 0c3af0c64e..ac80babd3e 100644 --- a/sysdeps/unix/sysv/linux/arm/localplt.data +++ b/sysdeps/unix/sysv/linux/arm/localplt.data @@ -8,8 +8,3 @@ libm.so: matherr libpthread.so: raise # The dynamic loader needs __tls_get_addr for TLS. ld.so: __tls_get_addr -# The TLS-enabled version of these functions is interposed from libc.so. -ld.so: _dl_signal_error -ld.so: _dl_catch_error -ld.so: _dl_signal_exception -ld.so: _dl_catch_exception diff --git a/sysdeps/unix/sysv/linux/csky/localplt.data b/sysdeps/unix/sysv/linux/csky/localplt.data index 0ed8650b65..f086f89c18 100644 --- a/sysdeps/unix/sysv/linux/csky/localplt.data +++ b/sysdeps/unix/sysv/linux/csky/localplt.data @@ -6,8 +6,3 @@ libc.so: free libc.so: malloc libc.so: memalign libc.so: realloc -# The TLS-enabled version of these functions is interposed from libc.so. -ld.so: _dl_signal_error -ld.so: _dl_catch_error -ld.so: _dl_signal_exception -ld.so: _dl_catch_exception diff --git a/sysdeps/unix/sysv/linux/hppa/localplt.data b/sysdeps/unix/sysv/linux/hppa/localplt.data index 09893d4dcf..18f1540f66 100644 --- a/sysdeps/unix/sysv/linux/hppa/localplt.data +++ b/sysdeps/unix/sysv/linux/hppa/localplt.data @@ -10,8 +10,3 @@ libc.so: __sigsetjmp libc.so: _IO_funlockfile libc.so: __errno_location libm.so: matherr -# The TLS-enabled version of these functions is interposed from libc.so. -ld.so: _dl_signal_error -ld.so: _dl_catch_error -ld.so: _dl_signal_exception -ld.so: _dl_catch_exception diff --git a/sysdeps/unix/sysv/linux/i386/localplt.data b/sysdeps/unix/sysv/linux/i386/localplt.data index 5334875b4b..0971c25dbd 100644 --- a/sysdeps/unix/sysv/linux/i386/localplt.data +++ b/sysdeps/unix/sysv/linux/i386/localplt.data @@ -7,8 +7,3 @@ libc.so: malloc + REL R_386_GLOB_DAT libc.so: memalign + REL R_386_GLOB_DAT libc.so: realloc + REL R_386_GLOB_DAT libm.so: matherr + REL R_386_GLOB_DAT -# The TLS-enabled version of these functions is interposed from libc.so. -ld.so: _dl_signal_error + REL R_386_GLOB_DAT -ld.so: _dl_catch_error + REL R_386_GLOB_DAT -ld.so: _dl_signal_exception + REL R_386_GLOB_DAT -ld.so: _dl_catch_exception + REL R_386_GLOB_DAT diff --git a/sysdeps/unix/sysv/linux/ia64/localplt.data b/sysdeps/unix/sysv/linux/ia64/localplt.data index 1c566a503e..ba488163bb 100644 --- a/sysdeps/unix/sysv/linux/ia64/localplt.data +++ b/sysdeps/unix/sysv/linux/ia64/localplt.data @@ -6,8 +6,3 @@ libc.so: realloc libm.so: matherr libm.so: matherrf libm.so: matherrl -# The TLS-enabled version of these functions is interposed from libc.so. -ld.so: _dl_signal_error -ld.so: _dl_catch_error -ld.so: _dl_signal_exception -ld.so: _dl_catch_exception diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/localplt.data b/sysdeps/unix/sysv/linux/m68k/coldfire/localplt.data index 3c5efb7204..1e362b39b6 100644 --- a/sysdeps/unix/sysv/linux/m68k/coldfire/localplt.data +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/localplt.data @@ -5,8 +5,3 @@ libc.so: malloc libc.so: memalign libc.so: realloc libm.so: matherr -# The TLS-enabled version of these functions is interposed from libc.so. -ld.so: _dl_signal_error -ld.so: _dl_catch_error -ld.so: _dl_signal_exception -ld.so: _dl_catch_exception diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/localplt.data b/sysdeps/unix/sysv/linux/m68k/m680x0/localplt.data index 843f4e25f2..d266b8f74b 100644 --- a/sysdeps/unix/sysv/linux/m68k/m680x0/localplt.data +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/localplt.data @@ -6,8 +6,3 @@ libc.so: malloc libc.so: memalign libc.so: realloc libm.so: matherr -# The TLS-enabled version of these functions is interposed from libc.so. -ld.so: _dl_signal_error -ld.so: _dl_catch_error -ld.so: _dl_signal_exception -ld.so: _dl_catch_exception diff --git a/sysdeps/unix/sysv/linux/microblaze/localplt.data b/sysdeps/unix/sysv/linux/microblaze/localplt.data index 0e98d5251e..a4196d46b0 100644 --- a/sysdeps/unix/sysv/linux/microblaze/localplt.data +++ b/sysdeps/unix/sysv/linux/microblaze/localplt.data @@ -7,8 +7,3 @@ libc.so: realloc libm.so: matherr # The dynamic loader needs __tls_get_addr for TLS. ld.so: __tls_get_addr ? -# The TLS-enabled version of these functions is interposed from libc.so. -ld.so: _dl_signal_error -ld.so: _dl_catch_error -ld.so: _dl_signal_exception -ld.so: _dl_catch_exception diff --git a/sysdeps/unix/sysv/linux/nios2/localplt.data b/sysdeps/unix/sysv/linux/nios2/localplt.data index b37987c7c0..517cf0106d 100644 --- a/sysdeps/unix/sysv/linux/nios2/localplt.data +++ b/sysdeps/unix/sysv/linux/nios2/localplt.data @@ -28,8 +28,3 @@ libc.so: __eqdf2 libc.so: __extendsfdf2 libc.so: __floatundidf ? libm.so: matherr -# The TLS-enabled version of these functions is interposed from libc.so. -ld.so: _dl_signal_error -ld.so: _dl_catch_error -ld.so: _dl_signal_exception -ld.so: _dl_catch_exception diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/localplt.data b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/localplt.data index a02dd5cc24..8fb56b6086 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/localplt.data +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/localplt.data @@ -5,8 +5,3 @@ libc.so: malloc libc.so: memalign libc.so: realloc libm.so: matherr -# The TLS-enabled version of these functions is interposed from libc.so. -ld.so: _dl_signal_error -ld.so: _dl_catch_error -ld.so: _dl_signal_exception -ld.so: _dl_catch_exception diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/localplt.data b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/localplt.data index d8072597b7..a4f0dbddec 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/localplt.data +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/localplt.data @@ -36,8 +36,3 @@ libc.so: realloc libm.so: copysignl ? libm.so: fabsl libm.so: matherr -# The TLS-enabled version of these functions is interposed from libc.so. -ld.so: _dl_signal_error -ld.so: _dl_catch_error -ld.so: _dl_signal_exception -ld.so: _dl_catch_exception diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/localplt.data b/sysdeps/unix/sysv/linux/powerpc/powerpc64/localplt.data index bb498fbe3a..2219aa9048 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/localplt.data +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/localplt.data @@ -4,8 +4,3 @@ libc.so: malloc libc.so: memalign libc.so: realloc libm.so: matherr -# The TLS-enabled version of these functions is interposed from libc.so. -ld.so: _dl_signal_error -ld.so: _dl_catch_error -ld.so: _dl_signal_exception -ld.so: _dl_catch_exception diff --git a/sysdeps/unix/sysv/linux/riscv/localplt.data b/sysdeps/unix/sysv/linux/riscv/localplt.data index 0ed8650b65..f086f89c18 100644 --- a/sysdeps/unix/sysv/linux/riscv/localplt.data +++ b/sysdeps/unix/sysv/linux/riscv/localplt.data @@ -6,8 +6,3 @@ libc.so: free libc.so: malloc libc.so: memalign libc.so: realloc -# The TLS-enabled version of these functions is interposed from libc.so. -ld.so: _dl_signal_error -ld.so: _dl_catch_error -ld.so: _dl_signal_exception -ld.so: _dl_catch_exception diff --git a/sysdeps/unix/sysv/linux/s390/localplt.data b/sysdeps/unix/sysv/linux/s390/localplt.data index a02dd5cc24..8fb56b6086 100644 --- a/sysdeps/unix/sysv/linux/s390/localplt.data +++ b/sysdeps/unix/sysv/linux/s390/localplt.data @@ -5,8 +5,3 @@ libc.so: malloc libc.so: memalign libc.so: realloc libm.so: matherr -# The TLS-enabled version of these functions is interposed from libc.so. -ld.so: _dl_signal_error -ld.so: _dl_catch_error -ld.so: _dl_signal_exception -ld.so: _dl_catch_exception diff --git a/sysdeps/unix/sysv/linux/sh/localplt.data b/sysdeps/unix/sysv/linux/sh/localplt.data index 3225177c50..16cb1a2207 100644 --- a/sysdeps/unix/sysv/linux/sh/localplt.data +++ b/sysdeps/unix/sysv/linux/sh/localplt.data @@ -12,8 +12,3 @@ libc.so: __errno_location libm.so: matherr # Generated by the compiler because there is no trap insn pattern. libc.so: abort ? -# The TLS-enabled version of these functions is interposed from libc.so. -ld.so: _dl_signal_error -ld.so: _dl_catch_error -ld.so: _dl_signal_exception -ld.so: _dl_catch_exception diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/localplt.data b/sysdeps/unix/sysv/linux/sparc/sparc32/localplt.data index be51efd566..c17a3714f4 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/localplt.data +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/localplt.data @@ -19,8 +19,3 @@ libc.so: malloc libc.so: memalign libc.so: realloc libm.so: matherr -# The TLS-enabled version of these functions is interposed from libc.so. -ld.so: _dl_signal_error -ld.so: _dl_catch_error -ld.so: _dl_signal_exception -ld.so: _dl_catch_exception diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/localplt.data b/sysdeps/unix/sysv/linux/sparc/sparc64/localplt.data index 809062d46c..b614213c4e 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/localplt.data +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/localplt.data @@ -18,8 +18,3 @@ libc.so: malloc libc.so: memalign libc.so: realloc libm.so: matherr -# The TLS-enabled version of these functions is interposed from libc.so. -ld.so: _dl_signal_error -ld.so: _dl_catch_error -ld.so: _dl_signal_exception -ld.so: _dl_catch_exception diff --git a/sysdeps/x86_64/localplt.data b/sysdeps/x86_64/localplt.data index 8f41e92870..950410fc30 100644 --- a/sysdeps/x86_64/localplt.data +++ b/sysdeps/x86_64/localplt.data @@ -9,8 +9,3 @@ libc.so: malloc + RELA R_X86_64_GLOB_DAT libc.so: memalign + RELA R_X86_64_GLOB_DAT libc.so: realloc + RELA R_X86_64_GLOB_DAT libm.so: matherr + RELA R_X86_64_GLOB_DAT -# The TLS-enabled version of these functions is interposed from libc.so. -ld.so: _dl_signal_error + RELA R_X86_64_GLOB_DAT -ld.so: _dl_catch_error + RELA R_X86_64_GLOB_DAT -ld.so: _dl_signal_exception + RELA R_X86_64_GLOB_DAT -ld.so: _dl_catch_exception + RELA R_X86_64_GLOB_DAT