From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:48180) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1Drv-00022b-UG for qemu-devel@nongnu.org; Tue, 14 Aug 2012 05:57:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T1Dru-0001bn-So for qemu-devel@nongnu.org; Tue, 14 Aug 2012 05:56:59 -0400 Received: from mnementh.archaic.org.uk ([81.2.115.146]:46396) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T1Dru-0001be-L2 for qemu-devel@nongnu.org; Tue, 14 Aug 2012 05:56:58 -0400 From: Peter Maydell Date: Tue, 14 Aug 2012 10:40:30 +0100 Message-Id: <1344937236-611-5-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1344937236-611-1-git-send-email-peter.maydell@linaro.org> References: <1344937236-611-1-git-send-email-peter.maydell@linaro.org> Subject: [Qemu-devel] [PATCH 04/10] linux-user: pass sockaddr from host to target List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori , Blue Swirl Cc: Riku Voipio , qemu-devel@nongnu.org From: Jing Huang Signed-off-by: Jing Huang Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- linux-user/syscall.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 1af68d2..47f0eb3 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -1268,7 +1268,6 @@ static inline abi_long host_to_target_sockaddr(abi_ulong target_addr, return 0; } -/* ??? Should this also swap msgh->name? */ static inline abi_long target_to_host_cmsg(struct msghdr *msgh, struct target_msghdr *target_msgh) { @@ -1325,7 +1324,6 @@ static inline abi_long target_to_host_cmsg(struct msghdr *msgh, return 0; } -/* ??? Should this also swap msgh->name? */ static inline abi_long host_to_target_cmsg(struct target_msghdr *target_msgh, struct msghdr *msgh) { @@ -1885,10 +1883,22 @@ static abi_long do_sendrecvmsg(int fd, abi_ulong target_msg, if (!is_error(ret)) { len = ret; ret = host_to_target_cmsg(msgp, &msg); - if (!is_error(ret)) + if (!is_error(ret)) { + msgp->msg_namelen = tswap32(msg.msg_namelen); + if (msg.msg_name != NULL) { + ret = host_to_target_sockaddr(tswapal(msgp->msg_name), + msg.msg_name, msg.msg_namelen); + if (ret) { + goto out; + } + } + ret = len; + } } } + +out: unlock_iovec(vec, target_vec, count, !send); unlock_user_struct(msgp, target_msg, send ? 0 : 1); return ret; -- 1.7.9.5