From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58758) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e80Rc-00039d-Kq for qemu-devel@nongnu.org; Fri, 27 Oct 2017 04:56:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e80RX-0000p1-NO for qemu-devel@nongnu.org; Fri, 27 Oct 2017 04:56:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34060) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e80RX-0000ok-Hd for qemu-devel@nongnu.org; Fri, 27 Oct 2017 04:56:43 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 88DEE34C4 for ; Fri, 27 Oct 2017 08:56:42 +0000 (UTC) From: "Daniel P. Berrange" Date: Fri, 27 Oct 2017 09:56:33 +0100 Message-Id: <20171027085633.14367-1-berrange@redhat.com> Subject: [Qemu-devel] [PATCH] sockets: avoid crash when cleaning up sockets for an invalid FD List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Dr . David Alan Gilbert" , Paolo Bonzini , Gerd Hoffmann , "Daniel P. Berrange" If socket_listen_cleanup is passed an invalid FD, then querying the socket local address will fail. We must thus be prepared for the returned addr to be NULL Reported-by: Dr. David Alan Gilbert Signed-off-by: Daniel P. Berrange --- util/qemu-sockets.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c index b47fb45885..c7fdaa63fb 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -1073,6 +1073,9 @@ void socket_listen_cleanup(int fd, Error **errp) SocketAddress *addr; addr = socket_local_address(fd, errp); + if (!addr) { + return; + } if (addr->type == SOCKET_ADDRESS_TYPE_UNIX && addr->u.q_unix.path) { -- 2.13.6