From patchwork Mon Jul 23 23:49:24 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jing Huang X-Patchwork-Id: 172705 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 0E13A2C036E for ; Tue, 24 Jul 2012 01:48:52 +1000 (EST) Received: from localhost ([::1]:56080 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1StKsM-0002Jv-78 for incoming@patchwork.ozlabs.org; Mon, 23 Jul 2012 11:48:50 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58473) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1StKsA-0002Jh-5k for qemu-devel@nongnu.org; Mon, 23 Jul 2012 11:48:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1StKs5-0006UC-Gf for qemu-devel@nongnu.org; Mon, 23 Jul 2012 11:48:38 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:34038) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1StKs5-0006U8-AV for qemu-devel@nongnu.org; Mon, 23 Jul 2012 11:48:33 -0400 Received: by pbbro12 with SMTP id ro12so10930101pbb.4 for ; Mon, 23 Jul 2012 08:48:32 -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=rtbsOocnJeaRMCN+vPgBMHEm4/LOast2lG0BX5LbyRQ=; b=OsmbxhZxJP5FKkhdliaQnY2eSH/Uwy+V/j//7aVEAISLN+iaVecHTmuc+HUhrbUxBJ 7wSTcHO46JGjksAleXHnkH1FoU7GicCmw+K4RQTvW9EZhMXf+xDpBU86SyS3D7fB80bK R0TvWLP6AwEdHQ3tQaU9MoVGFXcAuhJa04yV+A3uplMrsSttj2neO+4kvLTySUbnL+th nqjWcQZ4poEqLxVaoIRBcFiJ95mr8Z1dQv+k8Jvoz2f/HGXXfn3Qhy7CuMGeHSXVHph7 PrBFe1tfsFFtqQflOfX8hiCHAo+g1HHQTMOF801O80vXfjW97pEYzBMF4BJWA6/EOGkB b6aw== Received: by 10.68.225.199 with SMTP id rm7mr13058714pbc.76.1343058512302; Mon, 23 Jul 2012 08:48:32 -0700 (PDT) Received: from localhost.124.16.136.254 ([124.16.141.34]) by mx.google.com with ESMTPS id nh8sm10185325pbc.60.2012.07.23.08.48.29 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 23 Jul 2012 08:48:31 -0700 (PDT) From: Jing Huang To: qemu-devel@nongnu.org Date: Mon, 23 Jul 2012 23:49:24 +0000 Message-Id: <1343087364-13465-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 Subject: [Qemu-devel] [PATCH V4 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 | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 539af3f..3319bb8 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -1256,7 +1256,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) { @@ -1873,10 +1872,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;