[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/10] qemu-char: Add MSG_CMSG_CLOEXEC flag to recvm
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 01/10] qemu-char: Add MSG_CMSG_CLOEXEC flag to recvmsg |
Date: |
Wed, 15 Aug 2012 15:56:34 +0200 |
From: Corey Bryant <address@hidden>
Set the close-on-exec flag for the file descriptor received
via SCM_RIGHTS.
Signed-off-by: Corey Bryant <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
qemu-char.c | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/qemu-char.c b/qemu-char.c
index 382c71e..10d1504 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -2238,6 +2238,9 @@ static void unix_process_msgfd(CharDriverState *chr,
struct msghdr *msg)
if (fd < 0)
continue;
+#ifndef MSG_CMSG_CLOEXEC
+ qemu_set_cloexec(fd);
+#endif
if (s->msgfd != -1)
close(s->msgfd);
s->msgfd = fd;
@@ -2253,6 +2256,7 @@ static ssize_t tcp_chr_recv(CharDriverState *chr, char
*buf, size_t len)
struct cmsghdr cmsg;
char control[CMSG_SPACE(sizeof(int))];
} msg_control;
+ int flags = 0;
ssize_t ret;
iov[0].iov_base = buf;
@@ -2263,9 +2267,13 @@ static ssize_t tcp_chr_recv(CharDriverState *chr, char
*buf, size_t len)
msg.msg_control = &msg_control;
msg.msg_controllen = sizeof(msg_control);
- ret = recvmsg(s->fd, &msg, 0);
- if (ret > 0 && s->is_unix)
+#ifdef MSG_CMSG_CLOEXEC
+ flags |= MSG_CMSG_CLOEXEC;
+#endif
+ ret = recvmsg(s->fd, &msg, flags);
+ if (ret > 0 && s->is_unix) {
unix_process_msgfd(chr, &msg);
+ }
return ret;
}
--
1.7.6.5
- [Qemu-devel] [PULL 00/10] Block patches, Kevin Wolf, 2012/08/15
- [Qemu-devel] [PATCH 01/10] qemu-char: Add MSG_CMSG_CLOEXEC flag to recvmsg,
Kevin Wolf <=
- [Qemu-devel] [PATCH 03/10] block: Prevent detection of /dev/fdset/ as floppy, Kevin Wolf, 2012/08/15
- [Qemu-devel] [PATCH 02/10] qapi: Introduce add-fd, remove-fd, query-fdsets, Kevin Wolf, 2012/08/15
- [Qemu-devel] [PATCH 04/10] block: Convert open calls to qemu_open, Kevin Wolf, 2012/08/15
- [Qemu-devel] [PATCH 05/10] block: Convert close calls to qemu_close, Kevin Wolf, 2012/08/15
- [Qemu-devel] [PATCH 06/10] block: Enable qemu_open/close to work with fd sets, Kevin Wolf, 2012/08/15
- [Qemu-devel] [PATCH 07/10] monitor: Clean up fd sets on monitor disconnect, Kevin Wolf, 2012/08/15
- [Qemu-devel] [PATCH 09/10] block: Flush parent to OS with cache=unsafe, Kevin Wolf, 2012/08/15
- [Qemu-devel] [PATCH 10/10] qemu-iotests: Fix 030 after switch to GenericError, Kevin Wolf, 2012/08/15
- [Qemu-devel] [PATCH 08/10] iscsi: Fix NULL dereferences / races between task completion and abort, Kevin Wolf, 2012/08/15