From 8d9dde9429d2b5b513bf92d94a257a00ea2da1bf Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Fri, 9 Mar 2012 14:33:20 +0000 Subject: 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 Signed-off-by: Peter Maydell Signed-off-by: Anthony Liguori --- cpu-all.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cpu-all.h') 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 -- cgit v1.2.3-55-g7522