From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 3 Mar 2017 15:50:33 +0000 (+0000)
Subject: disas/arm: Avoid unintended sign extension
X-Git-Tag: v2.9.0-rc0~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=43c227f9dd7945bb4a895f841ecdb957bd8a12da;p=thirdparty%2Fqemu.git

disas/arm: Avoid unintended sign extension

When assembling 'given' from the instruction bytes, C's integer
promotion rules mean we may promote an unsigned char to a signed
integer before shifting it, and then sign extend to a 64-bit long,
which can set the high bits of the long.  The code doesn't in fact
care about the high bits if the long is 64 bits, but this is
surprising, so don't do it.

(Spotted by Coverity, CID 1005404.)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1488556233-31246-7-git-send-email-peter.maydell@linaro.org
---

diff --git a/disas/arm.c b/disas/arm.c
index 93c650344ce..27396dd3e16 100644
--- a/disas/arm.c
+++ b/disas/arm.c
@@ -3901,9 +3901,9 @@ print_insn_arm (bfd_vma pc, struct disassemble_info *info)
 
       status = info->read_memory_func (pc, (bfd_byte *)b, 4, info);
       if (little)
-	given = (b[0]) | (b[1] << 8) | (b[2] << 16) | (b[3] << 24);
+	given = (b[0]) | (b[1] << 8) | (b[2] << 16) | ((unsigned)b[3] << 24);
       else
-	given = (b[3]) | (b[2] << 8) | (b[1] << 16) | (b[0] << 24);
+	given = (b[3]) | (b[2] << 8) | (b[1] << 16) | ((unsigned)b[0] << 24);
     }
   else
     {