From: Pavel Zbitskiy <pavel.zbitskiy@gmail.com>
Date: Sat, 11 Jan 2014 09:34:10 +0000 (+0400)
Subject: linux-user: fixed getsockopt() optlen
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=fe54b24930f94bdfbc3d38eccd7adedf35f2f26f;p=qemu.git

linux-user: fixed getsockopt() optlen

optlen parameter of getsockopt() of type socklen_t* was read into
variable of type socklen_t, that caused zeroing out of upper 4 bytes
when running s390x on top of x86_64. This patch changes optlen type
to abi_ulong.

Signed-off-by: Pavel Zbitskiy <pavel.zbitskiy@gmail.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 0ac05b85f2..a9ce6ba11c 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -2406,7 +2406,7 @@ static abi_long do_socketcall(int num, abi_ulong vptr)
             abi_ulong level;
             abi_ulong optname;
             abi_ulong optval;
-            socklen_t optlen;
+            abi_ulong optlen;
 
             if (get_user_ual(sockfd, vptr)
                 || get_user_ual(level, vptr + n)