diff options
| author | Mark Wielaard <mark@klomp.org> | 2019-02-15 14:39:57 +0100 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2019-02-15 14:39:57 +0100 |
| commit | 1e52d4ce3aa2093d12901d32fe07aae70211fe2a (patch) | |
| tree | 01d1529ac98829606779f1768c8894c7894f312b | |
| parent | 89f5c7b57e9fe3674f24192592bbe1eb747a2435 (diff) | |
s390: elflint should check if _GLOBAL_OFFSET_TABLE_ points to .got.elfutils-0.176
The _GLOBAL_OFFSET_TABLE_ symbol might point to the DT_PLTGOT,
which is in the .got section, even if the symbol itself is
associated with the .got.plt section.
See https://sourceware.org/ml/binutils/2018-07/msg00200.html
Signed-off-by: Mark Wielaard <mark@klomp.org>
| -rw-r--r-- | backends/ChangeLog | 5 | ||||
| -rw-r--r-- | backends/s390_init.c | 1 | ||||
| -rw-r--r-- | backends/s390_symbol.c | 38 |
3 files changed, 44 insertions, 0 deletions
diff --git a/backends/ChangeLog b/backends/ChangeLog index 58a1b775..0c61a0b3 100644 --- a/backends/ChangeLog +++ b/backends/ChangeLog @@ -1,3 +1,8 @@ +2019-02-15 Mark Wielaard <mark@klomp.org> + + * s390_init.c (s390_init): Hook check_special_symbol. + * s390_symbol.c (s390_check_sepcial_symbol): New function. + 2018-12-27 Jim Wilson <jimw@sifive.com> * Makefile.am (riscv_SRCS): Add riscv64_corenote.c. diff --git a/backends/s390_init.c b/backends/s390_init.c index ba8df45d..0004aeea 100644 --- a/backends/s390_init.c +++ b/backends/s390_init.c @@ -54,6 +54,7 @@ s390_init (Elf *elf __attribute__ ((unused)), eh->name = "IBM S/390"; s390_init_reloc (eh); HOOK (eh, reloc_simple_type); + HOOK (eh, check_special_symbol); HOOK (eh, register_info); HOOK (eh, return_value_location); if (eh->class == ELFCLASS64) diff --git a/backends/s390_symbol.c b/backends/s390_symbol.c index f91e1373..9e80ecaa 100644 --- a/backends/s390_symbol.c +++ b/backends/s390_symbol.c @@ -32,6 +32,7 @@ #include <elf.h> #include <stddef.h> +#include <string.h> #define BACKEND s390_ #include "libebl_CPU.h" @@ -55,3 +56,40 @@ s390_reloc_simple_type (Ebl *ebl __attribute__ ((unused)), int type, return ELF_T_NUM; } } + +/* The _GLOBAL_OFFSET_TABLE_ symbol might point to the DT_PLTGOT, + which is in the .got section, even if the symbol itself is + associated with the is a .got.plt section. + https://sourceware.org/ml/binutils/2018-07/msg00200.html */ +bool +s390_check_special_symbol (Elf *elf, const GElf_Sym *sym, + const char *name, const GElf_Shdr *destshdr) +{ + if (name != NULL + && strcmp (name, "_GLOBAL_OFFSET_TABLE_") == 0) + { + size_t shstrndx; + if (elf_getshdrstrndx (elf, &shstrndx) != 0) + return false; + const char *sname = elf_strptr (elf, shstrndx, destshdr->sh_name); + if (sname != NULL + && (strcmp (sname, ".got") == 0 || strcmp (sname, ".got.plt") == 0)) + { + Elf_Scn *scn = NULL; + while ((scn = elf_nextscn (elf, scn)) != NULL) + { + GElf_Shdr shdr_mem; + GElf_Shdr *shdr = gelf_getshdr (scn, &shdr_mem); + if (shdr != NULL) + { + sname = elf_strptr (elf, shstrndx, shdr->sh_name); + if (sname != NULL && strcmp (sname, ".got") == 0) + return (sym->st_value >= shdr->sh_addr + && sym->st_value < shdr->sh_addr + shdr->sh_size); + } + } + } + } + + return false; +} |