From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from hall.aurel32.net (hall.aurel32.net [IPv6:2001:bc8:30d7:100::1]) by sourceware.org (Postfix) with ESMTPS id 9003E3858CDB for ; Thu, 13 Jul 2023 19:52:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9003E3858CDB Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=aurel32.net Authentication-Results: sourceware.org; spf=none smtp.mailfrom=aurel32.net DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=aurel32.net ; s=202004.hall; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date: Subject:Cc:To:From:Content-Type:From:Reply-To:Subject:Content-ID: Content-Description:In-Reply-To:References:X-Debbugs-Cc; bh=9iZjZW7pDk2RE08VcbiJ0kZkiIL0YAxwRUbUZz/DtZ0=; b=qhqvxLyhEC8loUnrVcTOU92FqR 1JSmXGMNr5ta/8b5qysBLD+xNuRvPclVUjhGboG9v/QN+ohZFuXSFY/OzWMg1nEwMx8Cdy0ndvXtA dKIpAVJBFkfcleoExg6q/Oh1Oop6ET3s90orB1YFXbg/CNxEj8rlFqbxpP5wbWjVQQlDZYVz7685v maasNSbXUspZLucP6TVhP/lPBDUpl0kaTbWVegB/KBcfuGJQ/C5TOgr1ltJrA3ZeXKD5m+BUUeN5i C4G6vkfi/9UIxDaw0lxl8ZLiREAgSUp2FP80F+X5iN59F3TxBIdjwib8/I4Vncb214YtwLCdBBf/m 0szNiZpw==; Received: from [2a01:e34:ec5d:a741:8a4c:7c4e:dc4c:1787] (helo=ohm.rr44.fr) by hall.aurel32.net with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qK2M0-007Z6i-Hg; Thu, 13 Jul 2023 21:51:56 +0200 Received: from aurel32 by ohm.rr44.fr with local (Exim 4.96) (envelope-from ) id 1qK2M0-006XN3-0Q; Thu, 13 Jul 2023 21:51:56 +0200 From: Aurelien Jarno To: libc-stable@sourceware.org Cc: Adhemerval Zanella , John Paul Adrian Glaubitz Subject: [COMMITTED 2.37] sparc: Fix la_symbind for bind-now (BZ 23734) Date: Thu, 13 Jul 2023 21:51:46 +0200 Message-Id: <20230713195146.1558213-1-aurelien@aurel32.net> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.3 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,SPF_HELO_PASS,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: From: Adhemerval Zanella The sparc ABI has multiple cases on how to handle JMP_SLOT relocations, (sparc_fixup_plt/sparc64_fixup_plt). For BINDNOW, _dl_audit_symbind will be responsible to setup the final relocation value; while for lazy binding _dl_fixup/_dl_profile_fixup will call the audit callback and tail cail elf_machine_fixup_plt (which will call sparc64_fixup_plt). This patch fixes by issuing the SPARC specific routine on bindnow and forwarding the audit value to elf_machine_fixup_plt for lazy resolution. It fixes the la_symbind for bind-now tests on sparc64 and sparcv9: elf/tst-audit24a elf/tst-audit24b elf/tst-audit24c elf/tst-audit24d Checked on sparc64-linux-gnu and sparcv9-linux-gnu. Tested-by: John Paul Adrian Glaubitz (cherry picked from commit dddc88587a7f48cbb361d9929ec23d790164eef8) --- elf/dl-audit.c | 6 ++--- elf/dl-runtime.c | 5 ++-- elf/do-rel.h | 6 +++-- sysdeps/generic/dl-lookupcfg.h | 2 +- sysdeps/generic/ldsodefs.h | 4 +-- sysdeps/hppa/dl-lookupcfg.h | 2 +- sysdeps/ia64/dl-lookupcfg.h | 2 +- sysdeps/powerpc/dl-lookupcfg.h | 4 +-- sysdeps/sparc/dl-lookupcfg.h | 49 ++++++++++++++++++++++++++++++++++ 9 files changed, 66 insertions(+), 14 deletions(-) create mode 100644 sysdeps/sparc/dl-lookupcfg.h diff --git a/elf/dl-audit.c b/elf/dl-audit.c index 00e794aa26..81543f85fe 100644 --- a/elf/dl-audit.c +++ b/elf/dl-audit.c @@ -176,8 +176,8 @@ rtld_hidden_def (_dl_audit_symbind_alt) void _dl_audit_symbind (struct link_map *l, struct reloc_result *reloc_result, - const ElfW(Sym) *defsym, DL_FIXUP_VALUE_TYPE *value, - lookup_t result) + const void *reloc, const ElfW(Sym) *defsym, + DL_FIXUP_VALUE_TYPE *value, lookup_t result, bool lazy) { bool for_jmp_slot = reloc_result == NULL; @@ -259,7 +259,7 @@ _dl_audit_symbind (struct link_map *l, struct reloc_result *reloc_result, } if (flags & LA_SYMB_ALTVALUE) - DL_FIXUP_BINDNOW_RELOC (value, new_value, sym.st_value); + DL_FIXUP_BINDNOW_RELOC (l, reloc, value, new_value, sym.st_value, lazy); } void diff --git a/elf/dl-runtime.c b/elf/dl-runtime.c index d35a725415..32a8bfcf74 100644 --- a/elf/dl-runtime.c +++ b/elf/dl-runtime.c @@ -139,7 +139,7 @@ _dl_fixup ( unsigned int init = atomic_load_acquire (&reloc_result->init); if (init == 0) { - _dl_audit_symbind (l, reloc_result, sym, &value, result); + _dl_audit_symbind (l, reloc_result, reloc, sym, &value, result, true); /* Store the result for later runs. */ if (__glibc_likely (! GLRO(dl_bind_not))) @@ -314,7 +314,8 @@ _dl_profile_fixup ( auditing libraries the possibility to change the value and tell us whether further auditing is wanted. */ if (defsym != NULL && GLRO(dl_naudit) > 0) - _dl_audit_symbind (l, reloc_result, defsym, &value, result); + _dl_audit_symbind (l, reloc_result, reloc, defsym, &value, result, + true); #endif /* Store the result for later runs. */ diff --git a/elf/do-rel.h b/elf/do-rel.h index 7e1cc4452a..ea973b155a 100644 --- a/elf/do-rel.h +++ b/elf/do-rel.h @@ -154,7 +154,8 @@ elf_dynamic_do_Rel (struct link_map *map, struct r_scope_elem *scope[], = RESOLVE_MAP (map, scope, &sym, rversion, ELF_MACHINE_JMP_SLOT); if (sym != NULL) - _dl_audit_symbind (map, NULL, sym, r_addr_arg, sym_map); + _dl_audit_symbind (map, NULL, r, sym, r_addr_arg, sym_map, + false); } #endif } @@ -200,7 +201,8 @@ elf_dynamic_do_Rel (struct link_map *map, struct r_scope_elem *scope[], (struct r_found_version *) NULL, ELF_MACHINE_JMP_SLOT); if (sym != NULL) - _dl_audit_symbind (map, NULL , sym,r_addr_arg, sym_map); + _dl_audit_symbind (map, NULL, r, sym,r_addr_arg, sym_map, + false); } # endif } diff --git a/sysdeps/generic/dl-lookupcfg.h b/sysdeps/generic/dl-lookupcfg.h index cc5e9d619b..e4f6358f88 100644 --- a/sysdeps/generic/dl-lookupcfg.h +++ b/sysdeps/generic/dl-lookupcfg.h @@ -27,5 +27,5 @@ #define DL_FIXUP_VALUE_ADDR(value) (value) #define DL_FIXUP_ADDR_VALUE(addr) (addr) #define DL_FIXUP_BINDNOW_ADDR_VALUE(addr) (addr) -#define DL_FIXUP_BINDNOW_RELOC(value, new_value, st_value) \ +#define DL_FIXUP_BINDNOW_RELOC(l, reloc, value, new_value, st_value, lazy) \ (*value) = st_value; diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index c99dad77cc..877c60ba89 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -1377,8 +1377,8 @@ void _dl_audit_preinit (struct link_map *l); the flags with LA_SYMB_NOPLTENTER | LA_SYMB_NOPLTEXIT prior calling la_symbind{32,64}. */ void _dl_audit_symbind (struct link_map *l, struct reloc_result *reloc_result, - const ElfW(Sym) *defsym, DL_FIXUP_VALUE_TYPE *value, - lookup_t result) + const void *reloc, const ElfW(Sym) *defsym, + DL_FIXUP_VALUE_TYPE *value, lookup_t result, bool lazy) attribute_hidden; /* Same as _dl_audit_symbind, but also sets LA_SYMB_DLSYM flag. */ void _dl_audit_symbind_alt (struct link_map *l, const ElfW(Sym) *ref, diff --git a/sysdeps/hppa/dl-lookupcfg.h b/sysdeps/hppa/dl-lookupcfg.h index 66b3ff9763..28daf3f89b 100644 --- a/sysdeps/hppa/dl-lookupcfg.h +++ b/sysdeps/hppa/dl-lookupcfg.h @@ -84,5 +84,5 @@ void attribute_hidden _dl_unmap (struct link_map *map); #define DL_FIXUP_ADDR_VALUE(addr) \ (*(DL_FIXUP_VALUE_TYPE *) ((uintptr_t) (addr) & ~2)) #define DL_FIXUP_BINDNOW_ADDR_VALUE(addr) (addr) -#define DL_FIXUP_BINDNOW_RELOC(value, new_value, st_value) \ +#define DL_FIXUP_BINDNOW_RELOC(l, reloc, value, new_value, st_value, lazy) \ *(value) = *(DL_FIXUP_VALUE_TYPE *) ((uintptr_t) (new_value) & ~2) diff --git a/sysdeps/ia64/dl-lookupcfg.h b/sysdeps/ia64/dl-lookupcfg.h index 0e47e529fe..64218fa7bb 100644 --- a/sysdeps/ia64/dl-lookupcfg.h +++ b/sysdeps/ia64/dl-lookupcfg.h @@ -75,5 +75,5 @@ extern void attribute_hidden _dl_unmap (struct link_map *map); #define DL_FIXUP_VALUE_ADDR(value) ((uintptr_t) &(value)) #define DL_FIXUP_ADDR_VALUE(addr) (*(struct fdesc *) (addr)) #define DL_FIXUP_BINDNOW_ADDR_VALUE(addr) (addr) -#define DL_FIXUP_BINDNOW_RELOC(value, new_value, st_value) \ +#define DL_FIXUP_BINDNOW_RELOC(l, reloc, value, new_value, st_value, lazy) \ (*value) = *(struct fdesc *) (st_value) diff --git a/sysdeps/powerpc/dl-lookupcfg.h b/sysdeps/powerpc/dl-lookupcfg.h index db0869bd33..0d6dcb8e25 100644 --- a/sysdeps/powerpc/dl-lookupcfg.h +++ b/sysdeps/powerpc/dl-lookupcfg.h @@ -25,7 +25,7 @@ /* We need to correctly set the audit modules value for bind-now. */ # define DL_FIXUP_BINDNOW_ADDR_VALUE(addr) \ (((Elf64_FuncDesc *)(addr))->fd_func) -# define DL_FIXUP_BINDNOW_RELOC(value, new_value, st_value) \ +# define DL_FIXUP_BINDNOW_RELOC(l, reloc, value, new_value, st_value, lazy) \ ({ \ Elf64_FuncDesc *opd = (Elf64_FuncDesc *) (value); \ opd->fd_func = (st_value); \ @@ -34,6 +34,6 @@ }) #else # define DL_FIXUP_BINDNOW_ADDR_VALUE(addr) (addr) -# define DL_FIXUP_BINDNOW_RELOC(value, new_value, st_value) \ +# define DL_FIXUP_BINDNOW_RELOC(l, reloc, value, new_value, st_value, lazy) \ (*value) = st_value; #endif diff --git a/sysdeps/sparc/dl-lookupcfg.h b/sysdeps/sparc/dl-lookupcfg.h new file mode 100644 index 0000000000..3a5a5c1d8c --- /dev/null +++ b/sysdeps/sparc/dl-lookupcfg.h @@ -0,0 +1,49 @@ +/* Configuration of lookup functions. SPARC64 version. + Copyright (C) 2023 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 + . */ + +/* The type of the return value of fixup/profile_fixup. */ +#define DL_FIXUP_VALUE_TYPE ElfW(Addr) +/* Construct a value of type DL_FIXUP_VALUE_TYPE from a code address + and a link map. */ +#define DL_FIXUP_MAKE_VALUE(map, addr) (addr) +/* Extract the code address from a value of type DL_FIXUP_MAKE_VALUE. + */ +#define DL_FIXUP_VALUE_CODE_ADDR(value) (value) +#define DL_FIXUP_VALUE_ADDR(value) (value) +#define DL_FIXUP_ADDR_VALUE(addr) (addr) +#define DL_FIXUP_BINDNOW_ADDR_VALUE(addr) (addr) +/* For bindnow, _dl_audit_symbind will be responsible to setup the final value + while for lazy binding _dl_fixup/_dl_profile_fixup will call the audit + callbacks and tail cail elf_machine_fixup_plt. */ +#ifdef __arch64__ +# define DL_SPARC_FIXUP(l, r, value, new_value) \ + sparc64_fixup_plt (l, r, value, new_value, (r)->r_addend, 0) +#else +# define DL_SPARC_FIXUP(l, r, value, new_value) \ + sparc_fixup_plt (r, value, new_value, 0, 1) +#endif +#define DL_FIXUP_BINDNOW_RELOC(l, reloc, value, new_value, st_value, lazy) \ + ({ \ + if (lazy) \ + (*value) = st_value; \ + else \ + { \ + const PLTREL *__r = (reloc); \ + DL_SPARC_FIXUP (l, __r, value, new_value); \ + } \ + }) -- 2.39.2