]> git.ipfire.org Git - thirdparty/glibc.git/commit
elf: Fix dynamic-link.h usage on rtld.c
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>
Wed, 13 Oct 2021 12:49:34 +0000 (09:49 -0300)
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>
Thu, 14 Oct 2021 17:52:07 +0000 (14:52 -0300)
commitd6d89608ac8cf2b37c75debad1fff653f6939f90
tree963c9d77032467e0b4af4f274979de09bd5c054e
parente59ced238482fd71f3e493717f14f6507346741e
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 <szabolcs.nagy@arm.com>
36 files changed:
elf/dl-load.c
elf/dl-reloc-static-pie.c
elf/dl-static-tls.h [new file with mode: 0644]
elf/dynamic-link.h
elf/get-dynamic-info.h
elf/rtld.c
elf/setup-vdso.h
sysdeps/aarch64/dl-machine.h
sysdeps/alpha/dl-machine.h
sysdeps/arc/dl-machine.h
sysdeps/arm/dl-machine-rel.h [new file with mode: 0644]
sysdeps/arm/dl-machine.h
sysdeps/csky/dl-machine.h
sysdeps/generic/dl-machine-rel.h [new file with mode: 0644]
sysdeps/generic/dl-machine.h
sysdeps/hppa/dl-machine.h
sysdeps/i386/dl-machine-rel.h [new file with mode: 0644]
sysdeps/i386/dl-machine.h
sysdeps/ia64/dl-machine.h
sysdeps/m68k/dl-machine.h
sysdeps/microblaze/dl-machine.h
sysdeps/mips/dl-machine-rel.h [new file with mode: 0644]
sysdeps/mips/dl-machine.h
sysdeps/nios2/dl-machine.h
sysdeps/powerpc/powerpc32/dl-machine.h
sysdeps/powerpc/powerpc64/dl-funcdesc.h [new file with mode: 0644]
sysdeps/powerpc/powerpc64/dl-irel.h
sysdeps/powerpc/powerpc64/dl-machine.h
sysdeps/riscv/dl-machine.h
sysdeps/s390/s390-32/dl-machine.h
sysdeps/s390/s390-64/dl-machine.h
sysdeps/sh/dl-machine.h
sysdeps/sparc/sparc32/dl-machine.h
sysdeps/sparc/sparc64/dl-machine.h
sysdeps/unix/sysv/linux/powerpc/libc-vdso.h
sysdeps/x86_64/dl-machine.h