From: Daniel P. Berrange <berrange@redhat.com>
Date: Thu, 10 Mar 2016 17:07:27 +0000 (+0000)
Subject: io: use qemu_accept to ensure SOCK_CLOEXEC is set
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=de7971ffb9a1ac85cbcc12f5380f44d31ed182e6;p=qemu.git

io: use qemu_accept to ensure SOCK_CLOEXEC is set

The QIOChannelSocket code mistakenly uses the bare accept()
function which does not set SOCK_CLOEXEC.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---

diff --git a/io/channel-socket.c b/io/channel-socket.c
index 775bb9fcbc..9b5f2d8887 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) {