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

or1k: Avoid R_OR1K_GOT16 signed overflow by using special howto

Browse Source 
Previously when fixing PR 21464 we masked out upper bits of the
relocation value in order to avoid overflow complaints when acceptable.
It turns out this does not work when the relocation value ends up being
signed.

To fix this this patch introduces a special howto with
complain_on_overflow set to complain_overflow_dont.  This is used in
place of the normal R_OR1K_GOT16 howto when we detect R_OR1K_GOT_AHI16
relocations.

bfd/ChangeLog:

	PR 28735
	* elf32-or1k.c (or1k_elf_got16_no_overflow_howto): Define.
	(or1k_elf_relocate_section): Use new howto instead of trying to
	mask out relocation bits.
This commit is contained in:
Stafford Horne
2022-02-02 20:11:56 +09:00
parent 14f9835738
commit c7c6e55b60
2 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bfd/ChangeLog
View File

@ -1,3 +1,10 @@
2022-02-02 Stafford Horne <shorne@gmail.com>
PR 28735
* elf32-or1k.c (or1k_elf_got16_no_overflow_howto): Define.
(or1k_elf_relocate_section): Use new howto instead of trying to
mask out relocation bits.
2022-01-24 Roland McGrath <mcgrathr@google.com>
* doc/local.mk (%D%/bfdver.texi): Add mkdir command.

24
bfd/elf32-or1k.c
View File

@ -828,6 +828,23 @@ static reloc_howto_type or1k_elf_howto_table[] =
false), /* pcrel_offset */
};
/* A copy of the R_OR1K_GOT16 used in the presense of R_OR1K_GOT_AHI16
relocations when we know we can ignore overflows. */
static reloc_howto_type or1k_elf_got16_no_overflow_howto =
HOWTO (R_OR1K_GOT16, /* type */
0, /* rightshift */
2, /* size (0 = byte, 1 = short, 2 = long) */
16, /* bitsize */
false, /* pc_relative */
0, /* bitpos */
complain_overflow_dont, /* complain_on_overflow */
bfd_elf_generic_reloc, /* special_function */
"R_OR1K_GOT16", /* name */
false, /* partial_inplace */
0, /* src_mask */
0xffff, /* dst_mask */
false); /* pcrel_offset */
/* Map BFD reloc types to Or1k ELF reloc types. */
struct or1k_reloc_map
@ -1506,12 +1523,11 @@ or1k_elf_relocate_section (bfd *output_bfd,
if (r_type == R_OR1K_GOT_AHI16)
saw_gotha = true;
/* If we have a R_OR1K_GOT16 followed by a R_OR1K_GOT_AHI16
/* If we have a R_OR1K_GOT16 following a R_OR1K_GOT_AHI16
relocation we assume the code is doing the right thing to avoid
overflows. Here we mask the lower 16-bit of the relocation to
avoid overflow validation failures. */
overflows. */
if (r_type == R_OR1K_GOT16 && saw_gotha)
relocation &= 0xffff;
howto = &or1k_elf_got16_no_overflow_howto;
/* Addend should be zero. */
if (rel->r_addend != 0)