From ebd1c6d1d30fb41827ea37895b9cdff939e5952a Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Tue, 24 Dec 2019 10:11:40 +1030 Subject: [PATCH] ubsan: arm: shift exponent 32 is too large for 32-bit type 'unsigned int' * arm-dis.c (print_insn_arm): Don't shift by 32 on unsigned int var. --- opcodes/ChangeLog | 4 ++++ opcodes/arm-dis.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 979ca97b4b..bdbb5f74b1 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,7 @@ +2019-12-24 Alan Modra + + * arm-dis.c (print_insn_arm): Don't shift by 32 on unsigned int var. + 2019-12-23 Jan Beulich * ppc-dis.c (print_insn_powerpc): Rename local variable "spaces" diff --git a/opcodes/arm-dis.c b/opcodes/arm-dis.c index 12eae61bb5..d7e21f99e1 100644 --- a/opcodes/arm-dis.c +++ b/opcodes/arm-dis.c @@ -9927,12 +9927,12 @@ print_insn_arm (bfd_vma pc, struct disassemble_info *info, long given) unsigned int immed = (given & 0xff); unsigned int a, i; - a = (((immed << (32 - rotate)) - | (immed >> rotate)) & 0xffffffff); + a = (immed << ((32 - rotate) & 31) + | immed >> rotate) & 0xffffffff; /* If there is another encoding with smaller rotate, the rotate should be specified directly. */ for (i = 0; i < 32; i += 2) - if ((a << i | a >> (32 - i)) <= 0xff) + if ((a << i | a >> ((32 - i) & 31)) <= 0xff) break; if (i != rotate) -- 2.34.1