From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:57372) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sqapd-0004AA-Kn for qemu-devel@nongnu.org; Sun, 15 Jul 2012 22:14:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sqapc-0002Pi-Qr for qemu-devel@nongnu.org; Sun, 15 Jul 2012 22:14:41 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:36787) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sqapc-0002Pd-KE for qemu-devel@nongnu.org; Sun, 15 Jul 2012 22:14:40 -0400 Received: by pbbro12 with SMTP id ro12so9683662pbb.4 for ; Sun, 15 Jul 2012 19:14:40 -0700 (PDT) From: Jing Huang Date: Mon, 16 Jul 2012 10:15:06 +0000 Message-Id: <1342433706-3376-1-git-send-email-jing.huang.pku@gmail.com> In-Reply-To: References: Subject: [Qemu-devel] [PATCH v2 3/3] linux-user: exclude SO_TIMESTAMP cmsg_type from unsuppoted ancillary data List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, riku.voipio@iki.fi, jing.huang.pku@gmail.com This patch excludes SO_TIMESTAMP cmsg_type from unsuppoted ancillary data. Signed-off-by: Jing Huang --- linux-user/syscall.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/linux-user/syscall.c b/linux-user/syscall.c index fc8690d..9fce57c 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -1349,7 +1349,9 @@ static inline abi_long host_to_target_cmsg(struct target_msghdr *target_msgh, target_cmsg->cmsg_type = tswap32(cmsg->cmsg_type); target_cmsg->cmsg_len = tswapal(TARGET_CMSG_LEN(len)); - if (cmsg->cmsg_level != TARGET_SOL_SOCKET || cmsg->cmsg_type != SCM_RIGHTS) { + if (cmsg->cmsg_level != TARGET_SOL_SOCKET || + (cmsg->cmsg_type != SCM_RIGHTS && + cmsg->cmsg_type != SO_TIMESTAMP)) { gemu_log("Unsupported ancillary data: %d/%d\n", cmsg->cmsg_level, cmsg->cmsg_type); memcpy(target_data, data, len); } else { -- 1.7.8.6