From: "Dr. David Alan Gilbert (git)" <dgilbert@redhat.com>
To: qemu-devel@nongnu.org, berrange@redhat.com, kraxel@redhat.com,
eblake@redhat.com, armbru@redhat.com, pabeni@redhat.com
Cc: quintela@redhat.com
Subject: [RFC PATCH 1/5] channel-socket: Only set CLOEXEC if we have space for fds
Date: Thu, 8 Apr 2021 20:11:55 +0100 [thread overview]
Message-ID: <20210408191159.133644-2-dgilbert@redhat.com> (raw)
In-Reply-To: <20210408191159.133644-1-dgilbert@redhat.com>
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
anyway.
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
io/channel-socket.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
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));
-#ifdef MSG_CMSG_CLOEXEC
- sflags |= MSG_CMSG_CLOEXEC;
-#endif
-
msg.msg_iov = (struct iovec *)iov;
msg.msg_iovlen = niov;
if (fds && nfds) {
msg.msg_control = control;
msg.msg_controllen = sizeof(control);
+#ifdef MSG_CMSG_CLOEXEC
+ sflags |= MSG_CMSG_CLOEXEC;
+#endif
+
}
retry:
--
2.31.1
next prev parent reply other threads:[~2021-04-08 20:02 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-08 19:11 [RFC PATCH 0/5] mptcp support Dr. David Alan Gilbert (git)
2021-04-08 19:11 ` Dr. David Alan Gilbert (git) [this message]
2021-04-09 9:03 ` [RFC PATCH 1/5] channel-socket: Only set CLOEXEC if we have space for fds Daniel P. Berrangé
2021-04-08 19:11 ` [RFC PATCH 2/5] io/net-listener: Call the notifier during finalize Dr. David Alan Gilbert (git)
2021-04-09 9:06 ` Daniel P. Berrangé
2021-04-08 19:11 ` [RFC PATCH 3/5] migration: Add cleanup hook for inwards migration Dr. David Alan Gilbert (git)
2021-04-09 9:10 ` Daniel P. Berrangé
2021-04-08 19:11 ` [RFC PATCH 4/5] migration/socket: Close the listener at the end Dr. David Alan Gilbert (git)
2021-04-09 9:10 ` Daniel P. Berrangé
2021-04-09 9:20 ` Paolo Abeni
2021-04-08 19:11 ` [RFC PATCH 5/5] sockets: Support multipath TCP Dr. David Alan Gilbert (git)
2021-04-09 9:22 ` Daniel P. Berrangé
2021-04-10 9:03 ` Markus Armbruster
2021-04-12 15:42 ` Dr. David Alan Gilbert
2021-04-09 9:34 ` [RFC PATCH 0/5] mptcp support Daniel P. Berrangé
2021-04-09 9:42 ` Daniel P. Berrangé
2021-04-09 9:55 ` Paolo Abeni
2021-04-12 14:46 ` Dr. David Alan Gilbert
2021-04-09 9:47 ` Paolo Abeni
2021-04-12 14:51 ` Dr. David Alan Gilbert
2021-04-12 14:56 ` Daniel P. Berrangé
2021-04-14 18:49 ` Dr. David Alan Gilbert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210408191159.133644-2-dgilbert@redhat.com \
--to=dgilbert@redhat.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=eblake@redhat.com \
--cc=kraxel@redhat.com \
--cc=pabeni@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=quintela@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).