From: Alex Bennée <alex.bennee@linaro.org>
Date: Thu, 6 Jun 2019 15:38:19 +0000 (+0100)
Subject: cputlb: cast size_t to target_ulong before using for address masks
X-Git-Tag: qemu-xen-4.13.0-rc1~131^2~20
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ab7a2009df66241a3742cbdfe8f9a1f66c6af21f;p=qemu-xen.git

cputlb: cast size_t to target_ulong before using for address masks

While size_t is defined to happily access the biggest host object this
isn't the case when generating masks for 64 bit guests on 32 bit
hosts. Otherwise we end up truncating the address when we fall back to
our unaligned helper.

Fixes: https://bugs.launchpad.net/qemu/+bug/1831545

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Tested-by: Andrew Randrianasulu <randrianasulu@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---

diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c
index 8d6891931e..bb9897b25a 100644
--- a/accel/tcg/cputlb.c
+++ b/accel/tcg/cputlb.c
@@ -1318,7 +1318,7 @@ load_helper(CPUArchState *env, target_ulong addr, TCGMemOpIdx oi,
         uint64_t r1, r2;
         unsigned shift;
     do_unaligned_access:
-        addr1 = addr & ~(size - 1);
+        addr1 = addr & ~((target_ulong)size - 1);
         addr2 = addr1 + size;
         r1 = full_load(env, addr1, oi, retaddr);
         r2 = full_load(env, addr2, oi, retaddr);