From nobody Wed May 1 18:57:11 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1511868310486787.920950218739; Tue, 28 Nov 2017 03:25:10 -0800 (PST) Received: from localhost ([::1]:37176 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eJe0Z-00030n-Ry for importer@patchew.org; Tue, 28 Nov 2017 06:24:59 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51911) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eJdzC-0002Je-Me for qemu-devel@nongnu.org; Tue, 28 Nov 2017 06:23:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eJdz8-0004AS-OF for qemu-devel@nongnu.org; Tue, 28 Nov 2017 06:23:34 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60690) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eJdz8-0004A8-IQ for qemu-devel@nongnu.org; Tue, 28 Nov 2017 06:23:30 -0500 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 BFFC38553D; Tue, 28 Nov 2017 11:23:29 +0000 (UTC) Received: from localhost.localdomain.com (unknown [10.42.22.189]) by smtp.corp.redhat.com (Postfix) with ESMTP id C796460605; Tue, 28 Nov 2017 11:23:28 +0000 (UTC) From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Tue, 28 Nov 2017 11:23:01 +0000 Message-Id: <20171128112301.5636-2-berrange@redhat.com> In-Reply-To: <20171128112301.5636-1-berrange@redhat.com> References: <20171128112301.5636-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Tue, 28 Nov 2017 11:23:29 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL (for 2.11) v1 1/1] sockets: avoid crash when cleaning up sockets for an invalid FD X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 Reviewed-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 8b75541ce4..a1cf47e625 100644 --- a/util/qemu-sockets.c +++ b/util/qemu-sockets.c @@ -1079,6 +1079,9 @@ void socket_listen_cleanup(int fd, Error **errp) SocketAddress *addr; =20 addr =3D socket_local_address(fd, errp); + if (!addr) { + return; + } =20 if (addr->type =3D=3D SOCKET_ADDRESS_TYPE_UNIX && addr->u.q_unix.path) { --=20 2.14.3