mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-12-09 04:21:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

PR26442 UBSAN: elf32-crx.c:512 cannot be represented in int

Browse Source 
PR 26442
	* elf32-crx.c (crx_elf_final_link_relocate): Calculate reloc_bits
	without undefined behaviour.  Tidy excess casts.
This commit is contained in:
Alan Modra 2020-08-31 08:32:32 +09:30
parent 26e3de8e0a
commit c1f138f955
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bfd/ChangeLog
View File

@ -1,3 +1,9 @@
2020-08-31 Alan Modra <amodra@gmail.com>
PR 26442
* elf32-crx.c (crx_elf_final_link_relocate): Calculate reloc_bits
without undefined behaviour. Tidy excess casts.
2020-08-31 Alan Modra <amodra@gmail.com>
* elf-m10300.c (mn10300_elf_relax_delete_bytes): Calculate

19
bfd/elf32-crx.c
View File

@ -506,25 +506,18 @@ crx_elf_final_link_relocate (reloc_howto_type *howto, bfd *input_bfd,
as signed or unsigned. */
check = Rvalue >> howto->rightshift;
/* Assumes two's complement. This expression avoids
overflow if howto->bitsize is the number of bits in
bfd_vma. */
reloc_bits = (((1 << (howto->bitsize - 1)) - 1) << 1) | 1;
reloc_bits = ((bfd_vma) 1 << (howto->bitsize - 1) << 1) - 1;
if (((bfd_vma) check & ~reloc_bits) != 0
&& (((bfd_vma) check & ~reloc_bits)
!= (-(bfd_vma) 1 & ~reloc_bits)))
if ((check & ~reloc_bits) != 0
&& (check & ~reloc_bits) != ((bfd_vma) -1 & ~reloc_bits))
{
/* The above right shift is incorrect for a signed
value. See if turning on the upper bits fixes the
overflow. */
if (howto->rightshift && (bfd_signed_vma) Rvalue < 0)
{
check |= ((bfd_vma) - 1
& ~((bfd_vma) - 1
>> howto->rightshift));
if (((bfd_vma) check & ~reloc_bits)
!= (-(bfd_vma) 1 & ~reloc_bits))
check |= (bfd_vma) -1 & ~((bfd_vma) -1 >> howto->rightshift);
if ((check & ~reloc_bits) != ((bfd_vma) -1 & ~reloc_bits))
return bfd_reloc_overflow;
}
else
@ -532,7 +525,7 @@ crx_elf_final_link_relocate (reloc_howto_type *howto, bfd *input_bfd,
}
/* Drop unwanted bits from the value we are relocating to. */
Rvalue >>= (bfd_vma) howto->rightshift;
Rvalue >>= howto->rightshift;
/* Apply dst_mask to select only relocatable part of the insn. */
Rvalue &= howto->dst_mask;