[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 13/28] vhost-user: support receiving file descriptors
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 13/28] vhost-user: support receiving file descriptors in slave_read |
Date: |
Wed, 23 May 2018 17:43:07 +0300 |
From: Tiwei Bie <address@hidden>
Signed-off-by: Tiwei Bie <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/virtio/vhost-user.c | 41 ++++++++++++++++++++++++++++++++++++++++-
1 file changed, 40 insertions(+), 1 deletion(-)
diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
index 38da869..85d8fd2 100644
--- a/hw/virtio/vhost-user.c
+++ b/hw/virtio/vhost-user.c
@@ -852,14 +852,44 @@ static void slave_read(void *opaque)
VhostUserHeader hdr = { 0, };
VhostUserPayload payload = { 0, };
int size, ret = 0;
+ struct iovec iov;
+ struct msghdr msgh;
+ int fd = -1;
+ char control[CMSG_SPACE(sizeof(fd))];
+ struct cmsghdr *cmsg;
+ size_t fdsize;
+
+ memset(&msgh, 0, sizeof(msgh));
+ msgh.msg_iov = &iov;
+ msgh.msg_iovlen = 1;
+ msgh.msg_control = control;
+ msgh.msg_controllen = sizeof(control);
/* Read header */
- size = read(u->slave_fd, &hdr, VHOST_USER_HDR_SIZE);
+ iov.iov_base = &hdr;
+ iov.iov_len = VHOST_USER_HDR_SIZE;
+
+ size = recvmsg(u->slave_fd, &msgh, 0);
if (size != VHOST_USER_HDR_SIZE) {
error_report("Failed to read from slave.");
goto err;
}
+ if (msgh.msg_flags & MSG_CTRUNC) {
+ error_report("Truncated message.");
+ goto err;
+ }
+
+ for (cmsg = CMSG_FIRSTHDR(&msgh); cmsg != NULL;
+ cmsg = CMSG_NXTHDR(&msgh, cmsg)) {
+ if (cmsg->cmsg_level == SOL_SOCKET &&
+ cmsg->cmsg_type == SCM_RIGHTS) {
+ fdsize = cmsg->cmsg_len - CMSG_LEN(0);
+ memcpy(&fd, CMSG_DATA(cmsg), fdsize);
+ break;
+ }
+ }
+
if (hdr.size > VHOST_USER_PAYLOAD_SIZE) {
error_report("Failed to read msg header."
" Size %d exceeds the maximum %zu.", hdr.size,
@@ -883,9 +913,15 @@ static void slave_read(void *opaque)
break;
default:
error_report("Received unexpected msg type.");
+ if (fd != -1) {
+ close(fd);
+ }
ret = -EINVAL;
}
+ /* Message handlers need to make sure that fd will be consumed. */
+ fd = -1;
+
/*
* REPLY_ACK feature handling. Other reply types has to be managed
* directly in their request handlers.
@@ -918,6 +954,9 @@ err:
qemu_set_fd_handler(u->slave_fd, NULL, NULL, NULL);
close(u->slave_fd);
u->slave_fd = -1;
+ if (fd != -1) {
+ close(fd);
+ }
return;
}
--
MST
- [Qemu-devel] [PULL 01/28] hw/pci-host/q35: Replace hardcoded value with macro, (continued)
- [Qemu-devel] [PULL 01/28] hw/pci-host/q35: Replace hardcoded value with macro, Michael S. Tsirkin, 2018/05/23
- [Qemu-devel] [PULL 02/28] allocate pci id for mdpy, Michael S. Tsirkin, 2018/05/23
- [Qemu-devel] [PULL 04/28] vhost: add trace for IOTLB miss, Michael S. Tsirkin, 2018/05/23
- [Qemu-devel] [PULL 05/28] update-linux-headers.sh: drop kvm_para.h hacks, Michael S. Tsirkin, 2018/05/23
- [Qemu-devel] [PULL 06/28] include/standard-headers: add asm-x86/kvm_para.h, Michael S. Tsirkin, 2018/05/23
- [Qemu-devel] [PULL 08/28] linux-headers: drop kvm_para.h, Michael S. Tsirkin, 2018/05/23
- [Qemu-devel] [PULL 09/28] update-linux-headers.sh: unistd.h, kvm consistency, Michael S. Tsirkin, 2018/05/23
- [Qemu-devel] [PULL 07/28] x86/cpu: use standard-headers/asm-x86.kvm_para.h, Michael S. Tsirkin, 2018/05/23
- [Qemu-devel] [PULL 12/28] vhost-user: add Net prefix to internal state structure, Michael S. Tsirkin, 2018/05/23
- [Qemu-devel] [PULL 14/28] virtio: support setting memory region based host notifier, Michael S. Tsirkin, 2018/05/23
- [Qemu-devel] [PULL 13/28] vhost-user: support receiving file descriptors in slave_read,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 11/28] linux-headers: add kvm header for mips, Michael S. Tsirkin, 2018/05/23
- [Qemu-devel] [PULL 16/28] libvhost-user: Send messages with no data, Michael S. Tsirkin, 2018/05/23
- [Qemu-devel] [PULL 15/28] vhost-user+postcopy: Use qemu_set_nonblock, Michael S. Tsirkin, 2018/05/23
- [Qemu-devel] [PULL 10/28] linux-headers: add unistd.h on all arches, Michael S. Tsirkin, 2018/05/23
- [Qemu-devel] [PULL 17/28] hw/virtio: Fix brace Werror with clang 6.0.0, Michael S. Tsirkin, 2018/05/23
- [Qemu-devel] [PULL 20/28] intel-iommu: send PSI always even if across PDEs, Michael S. Tsirkin, 2018/05/23
- [Qemu-devel] [PULL 19/28] nvdimm: fix typo in label-size definition, Michael S. Tsirkin, 2018/05/23
- [Qemu-devel] [PULL 18/28] contrib/vhost-user-blk: enable protocol feature for vhost-user-blk, Michael S. Tsirkin, 2018/05/23
- [Qemu-devel] [PULL 21/28] intel-iommu: remove IntelIOMMUNotifierNode, Michael S. Tsirkin, 2018/05/23
- [Qemu-devel] [PULL 23/28] intel-iommu: only do page walk for MAP notifiers, Michael S. Tsirkin, 2018/05/23