[libvirt] [PATCH v5 1/6] qemu-char: Add MSG_CMSG_CLOEXEC flag to recvmsg
Corey Bryant
coreyb at linux.vnet.ibm.com
Mon Jul 23 13:08:00 UTC 2012
Set the close-on-exec flag for the file descriptor received
via SCM_RIGHTS.
v4
-This patch is new in v4 (eblake at redhat.com)
v5
-Fallback to FD_CLOEXEC if MSG_CMSG_CLOEXEC is not available
(eblake at redhat.com, stefanha at linux.vnet.ibm.com)
Signed-off-by: Corey Bryant <coreyb at linux.vnet.ibm.com>
---
qemu-char.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/qemu-char.c b/qemu-char.c
index c2aaaee..eedf66d 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -2263,9 +2263,17 @@ static ssize_t tcp_chr_recv(CharDriverState *chr, char *buf, size_t len)
msg.msg_control = &msg_control;
msg.msg_controllen = sizeof(msg_control);
+#ifdef MSG_CMSG_CLOEXEC
+ ret = recvmsg(s->fd, &msg, MSG_CMSG_CLOEXEC);
+#else
ret = recvmsg(s->fd, &msg, 0);
- if (ret > 0 && s->is_unix)
+ if (ret > 0) {
+ qemu_set_cloexec(s->fd);
+ }
+#endif
+ if (ret > 0 && s->is_unix) {
unix_process_msgfd(chr, &msg);
+ }
return ret;
}
--
1.7.10.4
More information about the libvir-list
mailing list