diff mbox series

[v2,1/5] channel-socket: Only set CLOEXEC if we have space for fds

Message ID 20210421112834.107651-2-dgilbert@redhat.com (mailing list archive)
State New, archived
Headers show
Series mptcp support | expand

Commit Message

Dr. David Alan Gilbert April 21, 2021, 11:28 a.m. UTC
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>

MSG_CMSG_CLOEXEC cleans up received fd's; it's really only for Unix
sockets, but currently we enable it for everything; some socket types
(IP_MPTCP) don't like this.

Only enable it when we're giving the recvmsg room to receive fd's

Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
 io/channel-socket.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
diff mbox series


diff --git a/io/channel-socket.c b/io/channel-socket.c
index de259f7eed..606ec97cf7 100644
--- a/io/channel-socket.c
+++ b/io/channel-socket.c
@@ -487,15 +487,15 @@  static ssize_t qio_channel_socket_readv(QIOChannel *ioc,
     memset(control, 0, CMSG_SPACE(sizeof(int) * SOCKET_MAX_FDS));
-    sflags |= MSG_CMSG_CLOEXEC;
     msg.msg_iov = (struct iovec *)iov;
     msg.msg_iovlen = niov;
     if (fds && nfds) {
         msg.msg_control = control;
         msg.msg_controllen = sizeof(control);
+        sflags |= MSG_CMSG_CLOEXEC;