aboutsummaryrefslogtreecommitdiff
path: root/cpu-all.h
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2012-03-09 14:33:20 +0000
committerAnthony Liguori <aliguori@us.ibm.com>2012-03-12 14:05:26 -0500
commit8d9dde9429d2b5b513bf92d94a257a00ea2da1bf (patch)
tree97742f39ae157d5893a9e266e9ea21cf93793247 /cpu-all.h
parent1d3323de5fe5656844ea57a16eb432f09a366140 (diff)
cpu-all.h: Don't accidentally sign extend in g2h()
Cast the argument of the g2h() macro to a target_ulong so that it isn't accidentally sign-extended if it is a signed 32 bit type and long is a 64 bit type. In particular, this fixes a bug where it would return the wrong value for 32 bit guests on 64 bit hosts when passed in one of the arg* values from do_syscall() [which are all abi_long and thus signed types]. This could result in spurious failure of mlock(), among others. Reviewed-by: Andreas F=E4rber <afaerber@suse.de> Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'cpu-all.h')
-rw-r--r--cpu-all.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu-all.h b/cpu-all.h
index 80e6d4234f..a174532b19 100644
--- a/cpu-all.h
+++ b/cpu-all.h
@@ -197,7 +197,7 @@ extern unsigned long reserved_va;
#endif
/* All direct uses of g2h and h2g need to go away for usermode softmmu. */
-#define g2h(x) ((void *)((unsigned long)(x) + GUEST_BASE))
+#define g2h(x) ((void *)((unsigned long)(target_ulong)(x) + GUEST_BASE))
#if HOST_LONG_BITS <= TARGET_VIRT_ADDR_SPACE_BITS
#define h2g_valid(x) 1