From patchwork Sat Jul 21 01:28:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jing Huang X-Patchwork-Id: 172315 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 338732C027A for ; Sat, 21 Jul 2012 03:32:11 +1000 (EST) Received: from localhost ([::1]:35308 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SsH3h-0007w2-AO for incoming@patchwork.ozlabs.org; Fri, 20 Jul 2012 13:32:09 -0400 Received: from eggs.gnu.org ([208.118.235.92]:34630) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SsH1o-00072x-Ep for qemu-devel@nongnu.org; Fri, 20 Jul 2012 13:32:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SsGzw-0006Rz-CP for qemu-devel@nongnu.org; Fri, 20 Jul 2012 13:30:12 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:41842) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SsGzw-0006Rp-6f for qemu-devel@nongnu.org; Fri, 20 Jul 2012 13:28:16 -0400 Received: by pbbro12 with SMTP id ro12so6432200pbb.4 for ; Fri, 20 Jul 2012 10:28:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=0mrx7NbzTsAepnfh+2zGohp4QpiRj6iJDARCUyxxpLs=; b=vHJYDNof1Jq4JWY4kQeAkNWXjVCZEhSkzTSvrNCqT4ccY/izWPgxNObRCqFBtzvkTv I7uhiMgVuZIobe3lY3/XcZJnWsa3ohMQc4qY/ZF2PItgxLwtfSfndatEfobeMGIhmqGL +FOlrZYRBMePRB6YrMwY35fI+38FCy7jwGu5gCXIAP7gsVE9XsPG70re5KiFCaftrIeX 1ROXESzq0iid0JqruDpKXrKjWgXUppEjzD/IuoO2YGdhuJZnA36TiX6ZAckfAR6U23Mp ysjj0qULvTbMlohZVLkoESTqDMkmiuaA6L/sGi5kBO33QBjtEnJuboIJNdcCPSDWO7/2 YJjQ== Received: by 10.68.241.228 with SMTP id wl4mr15536124pbc.51.1342805295477; Fri, 20 Jul 2012 10:28:15 -0700 (PDT) Received: from localhost.124.16.136.254 ([124.16.141.34]) by mx.google.com with ESMTPS id qd2sm733611pbb.29.2012.07.20.10.28.12 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 20 Jul 2012 10:28:14 -0700 (PDT) From: Jing Huang To: qemu-devel@nongnu.org Date: Sat, 21 Jul 2012 01:28:57 +0000 Message-Id: <1342834137-2629-1-git-send-email-jing.huang.pku@gmail.com> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.45 Cc: peter.maydell@linaro.org, riku.voipio@iki.fi, jing.huang.pku@gmail.com Subject: [Qemu-devel] [PATCH V3 1/3] linux-user: pass sockaddr from host to target X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Jing Huang Reviewed-by: Peter Maydell --- linux-user/syscall.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 539af3f..82aa83d 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -1873,10 +1873,21 @@ 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;