From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60378) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y3Elr-00047L-Af for qemu-devel@nongnu.org; Mon, 22 Dec 2014 21:00:28 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y3Ell-0006Gn-Tn for qemu-devel@nongnu.org; Mon, 22 Dec 2014 21:00:23 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49834) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y3Ell-0006Gf-Ne for qemu-devel@nongnu.org; Mon, 22 Dec 2014 21:00:17 -0500 Date: Tue, 23 Dec 2014 09:59:57 +0800 From: Fam Zheng Message-ID: <20141223015957.GC4021@ad.nay.redhat.com> References: <20141221110217.GA14555@vostro> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20141221110217.GA14555@vostro> Subject: Re: [Qemu-devel] [PATCH] linux-user: support target-to-host SCM_CREDENTIALS List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alex Suykov Cc: Riku Voipio , qemu-devel@nongnu.org On Sun, 12/21 13:02, Alex Suykov wrote: > When passing ancillary data through a unix socket, handle > credentials properly instead of doing a simple copy and > issuing a warning. > > Signed-off-by: Alex Suykov > --- > linux-user/syscall.c | 15 +++++++++++---- > 1 file changed, 11 insertions(+), 4 deletions(-) > > diff --git a/linux-user/syscall.c b/linux-user/syscall.c > index aaac6a2..b067c5c 100644 > --- a/linux-user/syscall.c > +++ b/linux-user/syscall.c > @@ -1214,16 +1214,23 @@ static inline abi_long target_to_host_cmsg(struct msghdr *msgh, > cmsg->cmsg_type = tswap32(target_cmsg->cmsg_type); > cmsg->cmsg_len = CMSG_LEN(len); > > - if (cmsg->cmsg_level != SOL_SOCKET || cmsg->cmsg_type != SCM_RIGHTS) { > - gemu_log("Unsupported ancillary data: %d/%d\n", cmsg->cmsg_level, cmsg->cmsg_type); > - memcpy(data, target_data, len); > - } else { > + if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_RIGHTS) { > int *fd = (int *)data; > int *target_fd = (int *)target_data; > int i, numfds = len / sizeof(int); > > for (i = 0; i < numfds; i++) > fd[i] = tswap32(target_fd[i]); > + } else if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_CREDENTIALS) { > + struct ucred *cred = (struct ucred *)data; > + struct target_ucred *target_cred = (struct target_ucred *)target_data; > + > + __put_user(target_cred->pid, &cred->pid); > + __put_user(target_cred->uid, &cred->uid); > + __put_user(target_cred->gid, &cred->gid); > + } else { > + gemu_log("Unsupported ancillary data: %d/%d\n", cmsg->cmsg_level, cmsg->cmsg_type); > + memcpy(data, target_data, len); > } > > cmsg = CMSG_NXTHDR(msgh, cmsg); > -- > 2.0.3 > > I didn't review the code but checkpatch.pl complains about a few lines over 80 characters. Fam