PR26435, PR26436 UBSAN: elf32-cr16.c:928 left shift

	PR 26435
	PR 26436
	* elf32-cr16.c (cr16_elf_final_link_relocate): Calculate reloc_bits
	without undefined behaviour.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f3d204e1dc7e5c963e426918404d5116e2faa9ed..31c74bf8bee3485b13becc2ea2e566e0767f7ca4 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2020-08-30  Alan Modra  <amodra@gmail.com>
+
+       PR 26435
+       PR 26436
+       * elf32-cr16.c (cr16_elf_final_link_relocate): Calculate reloc_bits
+       without undefined behaviour.
+
 2020-08-29  Nick Clifton  <nickc@redhat.com>
 
        PR 26520

diff --git a/bfd/elf32-cr16.c b/bfd/elf32-cr16.c
index 8a3775efc07e80beb9a01c88870854aa2d55b16b..c1fc361f9de3385023c3ce2b61a291cb95d78beb 100644 (file)
--- a/bfd/elf32-cr16.c
+++ b/bfd/elf32-cr16.c
@@ -922,10 +922,7 @@ cr16_elf_final_link_relocate (reloc_howto_type *howto,
      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;
 
   /* For GOT and GOTC relocs no boundary checks applied.  */
   if (!((r_type == R_CR16_GOT_REGREL20)