From d6d89608ac8cf2b37c75debad1fff653f6939f90 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Wed, 13 Oct 2021 09:49:34 -0300 Subject: elf: Fix dynamic-link.h usage on rtld.c The 4af6982e4c fix does not fully handle RTLD_BOOTSTRAP usage on rtld.c due two issues: 1. RTLD_BOOTSTRAP is also used on dl-machine.h on various architectures and it changes the semantics of various machine relocation functions. 2. The elf_get_dynamic_info() change was done sideways, previously to 490e6c62aa get-dynamic-info.h was included by the first dynamic-link.h include *without* RTLD_BOOTSTRAP being defined. It means that the code within elf_get_dynamic_info() that uses RTLD_BOOTSTRAP is in fact unused. To fix 1. this patch now includes dynamic-link.h only once with RTLD_BOOTSTRAP defined. The ELF_DYNAMIC_RELOCATE call will now have the relocation fnctions with the expected semantics for the loader. And to fix 2. part of 4af6982e4c is reverted (the check argument elf_get_dynamic_info() is not required) and the RTLD_BOOTSTRAP pieces are removed. To reorganize the includes the static TLS definition is moved to its own header to avoid a circular dependency (it is defined on dynamic-link.h and dl-machine.h requires it at same time other dynamic-link.h definition requires dl-machine.h defitions). Also ELF_MACHINE_NO_REL, ELF_MACHINE_NO_RELA, and ELF_MACHINE_PLT_REL are moved to its own header. Only ancient ABIs need special values (arm, i386, and mips), so a generic one is used as default. The powerpc Elf64_FuncDesc is also moved to its own header, since csu code required its definition (which would require either include elf/ folder or add a full path with elf/). Checked on x86_64, i686, aarch64, armhf, powerpc64, powerpc32, and powerpc64le. Reviewed-by: Szabolcs Nagy --- sysdeps/generic/dl-machine-rel.h | 27 +++++++++++++++++++++++++++ sysdeps/generic/dl-machine.h | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 sysdeps/generic/dl-machine-rel.h (limited to 'sysdeps/generic') diff --git a/sysdeps/generic/dl-machine-rel.h b/sysdeps/generic/dl-machine-rel.h new file mode 100644 index 0000000000..9167a1dffc --- /dev/null +++ b/sysdeps/generic/dl-machine-rel.h @@ -0,0 +1,27 @@ +/* ELF dynamic relocation type supported by the architecture. + Copyright (C) 2001-2021 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 + . */ + +#ifndef _DL_MACHINE_REL_H +#define _DL_MACHINE_REL_H + +/* Defined if the architecture supports Elf{32,64}_Rel relocations. */ +#define ELF_MACHINE_NO_REL 1 +/* Defined if the architecture supports Elf{32,64}_Rela relocations. */ +#define ELF_MACHINE_NO_RELA 0 + +#endif diff --git a/sysdeps/generic/dl-machine.h b/sysdeps/generic/dl-machine.h index 4a4ab4fc70..7da695d903 100644 --- a/sysdeps/generic/dl-machine.h +++ b/sysdeps/generic/dl-machine.h @@ -20,6 +20,8 @@ #include #include +#include +#include /* Return nonzero iff ELF header is compatible with the running host. */ -- cgit v1.2.3