aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2018-06-15 14:57:14 +0100
committerPeter Maydell <peter.maydell@linaro.org>2018-06-15 15:23:34 +0100
commit22672c6075a16d1998e37686f02ed4bd2fb30f78 (patch)
tree3fc73e102f222ae06516b70fc33bd342eb31ea6d
parentafa4f6653dca095f63f3fe7f2001e9334f5676c1 (diff)
downloadqemu-22672c6075a16d1998e37686f02ed4bd2fb30f78.zip
qemu-22672c6075a16d1998e37686f02ed4bd2fb30f78.tar.gz
qemu-22672c6075a16d1998e37686f02ed4bd2fb30f78.tar.bz2
exec.c: Don't accidentally sign-extend 4-byte loads in subpage_read()
In subpage_read() we perform a load of the data into a local buffer which we then access using ldub_p(), lduw_p(), ldl_p() or ldq_p() depending on its size, storing the result into the uint64_t *data. Since ldl_p() returns an 'int', this means that for the 4-byte case we will sign-extend the data, whereas for 1 and 2 byte reads we zero-extend it. This ought not to matter since the caller will likely ignore values in the high bytes of the data, but add a cast so that we're consistent. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-id: 20180611171007.4165-3-peter.maydell@linaro.org
-rw-r--r--exec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/exec.c b/exec.c
index 9cbba6a..90b47cd 100644
--- a/exec.c
+++ b/exec.c
@@ -2747,7 +2747,7 @@ static MemTxResult subpage_read(void *opaque, hwaddr addr, uint64_t *data,
*data = lduw_p(buf);
return MEMTX_OK;
case 4:
- *data = ldl_p(buf);
+ *data = (uint32_t)ldl_p(buf);
return MEMTX_OK;
case 8:
*data = ldq_p(buf);