From: "Daniel P. Berrange" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>
Subject: [Qemu-devel] [PULL v1 11/18] io: use qemu_accept to ensure SOCK_CLOEXEC is set
Date: Fri, 11 Mar 2016 10:04:01 +0000 [thread overview]
Message-ID: <1457690648-19267-12-git-send-email-berrange@redhat.com> (raw)
In-Reply-To: <1457690648-19267-1-git-send-email-berrange@redhat.com>
The QIOChannelSocket code mistakenly uses the bare accept()
function which does not set SOCK_CLOEXEC.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
io/channel-socket.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/io/channel-socket.c b/io/channel-socket.c
index 775bb9f..9b5f2d8 100644
--- a/io/channel-socket.c
+++ b/io/channel-socket.c
@@ -343,8 +343,8 @@ qio_channel_socket_accept(QIOChannelSocket *ioc,
retry:
trace_qio_channel_socket_accept(ioc);
- cioc->fd = accept(ioc->fd, (struct sockaddr *)&cioc->remoteAddr,
- &cioc->remoteAddrLen);
+ cioc->fd = qemu_accept(ioc->fd, (struct sockaddr *)&cioc->remoteAddr,
+ &cioc->remoteAddrLen);
if (cioc->fd < 0) {
trace_qio_channel_socket_accept_fail(ioc);
if (socket_error() == EINTR) {
--
2.5.0
next prev parent reply other threads:[~2016-03-11 10:04 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-11 10:03 [Qemu-devel] [PULL v1 00/18] Merge I/O channel fixes for Win32 Daniel P. Berrange
2016-03-11 10:03 ` [Qemu-devel] [PULL v1 01/18] osdep: fix socket_error() to work with Mingw64 Daniel P. Berrange
2016-03-11 10:03 ` [Qemu-devel] [PULL v1 02/18] io: use bind() to check for IPv4/6 availability Daniel P. Berrange
2016-03-11 10:03 ` [Qemu-devel] [PULL v1 03/18] io: initialize sockets in test program Daniel P. Berrange
2016-03-11 10:03 ` [Qemu-devel] [PULL v1 04/18] io: bind to socket before creating QIOChannelSocket Daniel P. Berrange
2016-03-11 10:03 ` [Qemu-devel] [PULL v1 05/18] io: wait for incoming client in socket test Daniel P. Berrange
2016-03-11 10:03 ` [Qemu-devel] [PULL v1 06/18] io: set correct error object in background reader test thread Daniel P. Berrange
2016-03-11 10:03 ` [Qemu-devel] [PULL v1 07/18] io: assert errors before asserting content in I/O test Daniel P. Berrange
2016-03-11 10:03 ` [Qemu-devel] [PULL v1 08/18] io: fix copy+paste mistake in socket error message Daniel P. Berrange
2016-03-11 10:03 ` [Qemu-devel] [PULL v1 09/18] io: pass HANDLE to g_source_add_poll on Win32 Daniel P. Berrange
2016-03-11 10:04 ` [Qemu-devel] [PULL v1 10/18] io: introduce qio_channel_create_socket_watch Daniel P. Berrange
2016-03-11 10:04 ` Daniel P. Berrange [this message]
2016-03-11 10:04 ` [Qemu-devel] [PULL v1 12/18] io: remove checking of EWOULDBLOCK Daniel P. Berrange
2016-03-11 10:04 ` [Qemu-devel] [PULL v1 13/18] io: implement socket watch for win32 using WSAEventSelect+select Daniel P. Berrange
2016-03-11 10:04 ` [Qemu-devel] [PULL v1 14/18] char: remove qemu_chr_finish_socket_connection method Daniel P. Berrange
2016-03-11 10:04 ` [Qemu-devel] [PULL v1 15/18] char: remove socket_try_connect method Daniel P. Berrange
2016-03-11 10:04 ` [Qemu-devel] [PULL v1 16/18] char: remove qemu_chr_open_socket_fd method Daniel P. Berrange
2016-03-11 10:04 ` [Qemu-devel] [PULL v1 17/18] osdep: add wrappers for socket functions Daniel P. Berrange
2016-03-11 10:04 ` [Qemu-devel] [PULL v1 18/18] osdep: remove use of socket_error() from all code Daniel P. Berrange
2016-03-14 13:50 ` [Qemu-devel] [PULL v1 00/18] Merge I/O channel fixes for Win32 Peter Maydell
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=1457690648-19267-12-git-send-email-berrange@redhat.com \
--to=berrange@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/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).