From b84f6152ee8bb141acae181b34a51c3e58da8930 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Wed, 11 Dec 2019 08:52:22 +1030 Subject: [PATCH] ubsan: tic6x: shift left of int * tic6x-dis.c (tic6x_extract_32): Avoid signed overflow. --- opcodes/ChangeLog | 4 ++++ opcodes/tic6x-dis.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 3ae93c16414..3ba885c48b9 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,7 @@ +2019-12-11 Alan Modra + + * tic6x-dis.c (tic6x_extract_32): Avoid signed overflow. + 2019-12-11 Alan Modra * tic4x-dis.c (tic4x_print_register): Formatting. Don't segfault diff --git a/opcodes/tic6x-dis.c b/opcodes/tic6x-dis.c index 36075da1157..45a1e98f2a2 100644 --- a/opcodes/tic6x-dis.c +++ b/opcodes/tic6x-dis.c @@ -163,9 +163,9 @@ static unsigned int tic6x_extract_32 (unsigned char *p, struct disassemble_info *info) { if (info->endian == BFD_ENDIAN_LITTLE) - return (p[0]) | (p[1] << 8) | (p[2] << 16) | (p[3] << 24); + return p[0] | (p[1] << 8) | (p[2] << 16) | ((unsigned) p[3] << 24); else - return (p[3]) | (p[2] << 8) | (p[1] << 16) | (p[0] << 24); + return p[3] | (p[2] << 8) | (p[1] << 16) | ((unsigned) p[0] << 24); } /* Extract a 16-bit value read from the instruction stream. */ -- 2.30.2