espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-22 19:09:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

R_PPC64_GOT_LO_DS and R_PPC64_GOT_HA sanity check

Browse Source 
The previous sanity check allowed a ld on the HA reloc and addis
on the LO_DS.

	* elf64-ppc.c (ppc64_elf_relocate_section): Tighten sanity check
	on R_PPC64_GOT_LO_DS and R_PPC64_GOT_HA instructions.
This commit is contained in:
Alan Modra
2020-10-16 09:26:32 +10:30
parent a1c72cdfab
commit fba8689ad3
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
bfd/ChangeLog
View File

@ -1,3 +1,8 @@
2020-10-16 Alan Modra <amodra@gmail.com>
* elf64-ppc.c (ppc64_elf_relocate_section): Tighten sanity check
on R_PPC64_GOT_LO_DS and R_PPC64_GOT_HA instructions.
2020-10-09 Alan Modra <amodra@gmail.com> 2020-10-09 Alan Modra <amodra@gmail.com>
* elf64-ppc.c (write_plt_relocs_for_local_syms): Don't do local * elf64-ppc.c (write_plt_relocs_for_local_syms): Don't do local

6
bfd/elf64-ppc.c
View File

@ -16091,14 +16091,16 @@ ppc64_elf_relocate_section (bfd *output_bfd,
&& (h == NULL || SYMBOL_REFERENCES_LOCAL (info, &h->elf))) && (h == NULL || SYMBOL_REFERENCES_LOCAL (info, &h->elf)))
{ {
insn = bfd_get_32 (input_bfd, contents + (rel->r_offset & ~3)); insn = bfd_get_32 (input_bfd, contents + (rel->r_offset & ~3));
if ((insn & (0x3fu << 26 | 0x3)) == 58u << 26 /* ld */) if (r_type == R_PPC64_GOT16_LO_DS
&& (insn & (0x3fu << 26 | 0x3)) == 58u << 26 /* ld */)
{ {
insn += (14u << 26) - (58u << 26); insn += (14u << 26) - (58u << 26);
bfd_put_32 (input_bfd, insn, contents + (rel->r_offset & ~3)); bfd_put_32 (input_bfd, insn, contents + (rel->r_offset & ~3));
r_type = R_PPC64_TOC16_LO; r_type = R_PPC64_TOC16_LO;
rel->r_info = ELF64_R_INFO (r_symndx, r_type); rel->r_info = ELF64_R_INFO (r_symndx, r_type);
} }
else if ((insn & (0x3fu << 26)) == 15u << 26 /* addis */) else if (r_type == R_PPC64_GOT16_HA
&& (insn & (0x3fu << 26)) == 15u << 26 /* addis */)
{ {
r_type = R_PPC64_TOC16_HA; r_type = R_PPC64_TOC16_HA;
rel->r_info = ELF64_R_INFO (r_symndx, r_type); rel->r_info = ELF64_R_INFO (r_symndx, r_type);