|
 |
4a2fec |
From b76eb750ff4e5a698428465d6b54684d49319e40 Mon Sep 17 00:00:00 2001
|
|
|
4a2fec |
From: "Daniel P. Berrange" <berrange@redhat.com>
|
|
|
4a2fec |
Date: Fri, 8 Dec 2017 14:00:16 +0100
|
|
|
4a2fec |
Subject: [PATCH 21/21] sockets: avoid crash when cleaning up sockets for an
|
|
|
4a2fec |
invalid FD
|
|
|
4a2fec |
|
|
|
4a2fec |
RH-Author: Daniel P. Berrange <berrange@redhat.com>
|
|
|
4a2fec |
Message-id: <20171208140016.29707-1-berrange@redhat.com>
|
|
|
4a2fec |
Patchwork-id: 78275
|
|
|
4a2fec |
O-Subject: [RHV-7.5 qemu-kvm-rhev PATCH] sockets: avoid crash when cleaning up sockets for an invalid FD
|
|
|
4a2fec |
Bugzilla: 1506218
|
|
|
4a2fec |
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: Laurent Vivier <lvivier@redhat.com>
|
|
|
4a2fec |
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
|
|
|
4a2fec |
|
|
|
4a2fec |
If socket_listen_cleanup is passed an invalid FD, then querying the socket
|
|
|
4a2fec |
local address will fail. We must thus be prepared for the returned addr to
|
|
|
4a2fec |
be NULL
|
|
|
4a2fec |
|
|
|
4a2fec |
Reported-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
4a2fec |
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
|
|
|
4a2fec |
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
|
|
|
4a2fec |
(cherry picked from commit 2d7ad7c05e762d5b10a57eba9af1bb6b41700854)
|
|
|
4a2fec |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
4a2fec |
---
|
|
|
4a2fec |
util/qemu-sockets.c | 3 +++
|
|
|
4a2fec |
1 file changed, 3 insertions(+)
|
|
|
4a2fec |
|
|
|
4a2fec |
diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
|
|
|
4a2fec |
index 1358c81..bca6a06 100644
|
|
|
4a2fec |
--- a/util/qemu-sockets.c
|
|
|
4a2fec |
+++ b/util/qemu-sockets.c
|
|
|
4a2fec |
@@ -1190,6 +1190,9 @@ void socket_listen_cleanup(int fd, Error **errp)
|
|
|
4a2fec |
SocketAddress *addr;
|
|
|
4a2fec |
|
|
|
4a2fec |
addr = socket_local_address(fd, errp);
|
|
|
4a2fec |
+ if (!addr) {
|
|
|
4a2fec |
+ return;
|
|
|
4a2fec |
+ }
|
|
|
4a2fec |
|
|
|
4a2fec |
if (addr->type == SOCKET_ADDRESS_TYPE_UNIX
|
|
|
4a2fec |
&& addr->u.q_unix.path) {
|
|
|
4a2fec |
--
|
|
|
4a2fec |
1.8.3.1
|
|
|
4a2fec |
|