mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-23 03:10:05 +00:00
Fix TLS relocations against local symbols on powerpc32, sparc32 and sparc64
Normally, TLS relocations against local symbols are optimised by the linker to be absolute. However, gold does not do this, and so it is possible to end up with, for example, R_SPARC_TLS_DTPMOD64 referring to a local symbol. Since sym_map is left as null in elf_machine_rela for the special local symbol case, the relocation handling thinks it has nothing to do, and so the module gets left as 0. Havoc then ensues when the variable in question is accessed. Before this fix, the main_local_gold program would receive a SIGBUS on sparc64, and SIGSEGV on powerpc32. With this fix applied, that test now passes like the rest of them. * sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela): Assign sym_map to be map for local symbols, as TLS relocations use sym_map to determine whether the symbol is defined and to extract the TLS information. * sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela): Likewise. * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela): Likewise.
This commit is contained in:
parent
e8dbd6a36d
commit
8644588807
@ -1,3 +1,12 @@
|
||||
2017-10-13 James Clarke <jrtc27@jrtc27.com>
|
||||
|
||||
* sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela):
|
||||
Assign sym_map to be map for local symbols, as TLS relocations
|
||||
use sym_map to determine whether the symbol is defined and to
|
||||
extract the TLS information.
|
||||
* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela): Likewise.
|
||||
* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela): Likewise.
|
||||
|
||||
2017-10-13 Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com>
|
||||
|
||||
[BZ #22189]
|
||||
|
@ -310,7 +310,10 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
|
||||
against local symbols. */
|
||||
if (__builtin_expect (ELF32_ST_BIND (sym->st_info) == STB_LOCAL, 0)
|
||||
&& sym->st_shndx != SHN_UNDEF)
|
||||
value = map->l_addr;
|
||||
{
|
||||
sym_map = map;
|
||||
value = map->l_addr;
|
||||
}
|
||||
else
|
||||
{
|
||||
sym_map = RESOLVE_MAP (&sym, version, r_type);
|
||||
|
@ -376,6 +376,7 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
|
||||
if (__builtin_expect (ELF32_ST_BIND (sym->st_info) == STB_LOCAL, 0)
|
||||
&& sym->st_shndx != SHN_UNDEF)
|
||||
{
|
||||
sym_map = map;
|
||||
value = map->l_addr;
|
||||
}
|
||||
else
|
||||
|
@ -403,6 +403,7 @@ elf_machine_rela (struct link_map *map, const Elf64_Rela *reloc,
|
||||
if (__builtin_expect (ELF64_ST_BIND (sym->st_info) == STB_LOCAL, 0)
|
||||
&& sym->st_shndx != SHN_UNDEF)
|
||||
{
|
||||
sym_map = map;
|
||||
value = map->l_addr;
|
||||
}
|
||||
else
|
||||
|
Loading…
Reference in New Issue
Block a user