Commit 8d9dde94 authored by Peter Maydell's avatar Peter Maydell Committed by Anthony Liguori
Browse files

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: default avatarAndreas F=E4rber <afaerber@suse.de>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 1d3323de

cpu-all.h

+1 −1
Original line number Diff line number Diff line
@@ -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