Skip to contentSkip to conversation

io: ensure UNIX client doesn't unlink server socket

PATCH In review Daniel P. Berrangé 2 participants 2 messages Jan 14, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 io: ensure UNIX client doesn't unlink server socket

The qio_channel_socket_close method for was mistakenly unlinking the UNIX server socket, even if the channel was a client connection. This was not noticed with chardevs, since they never call close, but with the VNC server, this caused the VNC server socket to be deleted after the first client quit.

The qio_channel_socket_close method also needlessly reimplemented the logic that already exists in socket_listen_cleanup(). Just call that method directly, for listen sockets only.

This fixes a regression introduced in QEMU 3.0.0 with

commit d66f78e1eaa832f73c771d9df1b606fe75d52a50
Author: Pavel Balaev <[email protected]>
Date: Mon May 21 19:17:35 2018 +0300

Delete AF_UNIX socket after close

Fixes launchpad #1795100

---
 io/channel-socket.c            | 19 ++------
 tests/test-io-channel-socket.c | 86 ++++++++++++++++++++++++++++++----
 2 files changed, 80 insertions(+), 25 deletions(-)
io/channel-socket.c +4 -15
index b50e63a053..bc5f80e780 100644
@@ -688,10 +688,13 @@ qio_channel_socket_close(QIOChannel *ioc,
     int rc = 0;
 
     if (sioc->fd != -1) {
-        SocketAddress *addr = socket_local_address(sioc->fd, errp);
 #ifdef WIN32
         WSAEventSelect(sioc->fd, NULL, 0);
 #endif
+        if (qio_channel_has_feature(ioc, QIO_CHANNEL_FEATURE_LISTEN)) {
+            socket_listen_cleanup(sioc->fd, errp);
+        }
+
         if (closesocket(sioc->fd) < 0) {
             sioc->fd = -1;
             error_setg_errno(errp, errno,
@@ -699,20 +702,6 @@ qio_channel_socket_close(QIOChannel *ioc,
             return -1;
         }
         sioc->fd = -1;
-
-        if (addr && addr->type == SOCKET_ADDRESS_TYPE_UNIX
-            && addr->u.q_unix.path) {
-            if (unlink(addr->u.q_unix.path) < 0 && errno != ENOENT) {
-                error_setg_errno(errp, errno,
-                                 "Failed to unlink socket %s",
-                                 addr->u.q_unix.path);
-                rc = -1;
-            }
-        }
-
-        if (addr) {
-            qapi_free_SocketAddress(addr);
-        }
     }
     return rc;
 }
tests/test-io-channel-socket.c +76 -10

189 lines not on this page · raw message

Signature · 1 line
2.19.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 18 lines · Daniel P. Berrangé

The qio_channel_socket_close method for was mistakenly unlinking the UNIX server socket, even if the channel was a client connection. This was not noticed with chardevs, since they never call close, but with the VNC server, this caused the VNC server socket to be deleted after the first client quit.

The qio_channel_socket_close method also needlessly reimplemented the logic that already exists in socket_listen_cleanup(). Just call that method directly, for listen sockets only.

This fixes a regression introduced in QEMU 3.0.0 with

commit d66f78e1eaa832f73c771d9df1b606fe75d52a50
Author: Pavel Balaev <[email protected]>
Date: Mon May 21 19:17:35 2018 +0300

Delete AF_UNIX socket after close

Quoted 7 lines

Fixes launchpad #1795100

---
 io/channel-socket.c            | 19 ++------
 tests/test-io-channel-socket.c | 86 ++++++++++++++++++++++++++++++----
 2 files changed, 80 insertions(+), 25 deletions(-)
Signature · 3 lines
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org