From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:49711) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1Ebv-0000ur-Sq for qemu-devel@nongnu.org; Tue, 05 Mar 2019 13:16:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1Ebv-0001dw-2H for qemu-devel@nongnu.org; Tue, 05 Mar 2019 13:16:15 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47344) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h1Ebu-0001cf-Mz for qemu-devel@nongnu.org; Tue, 05 Mar 2019 13:16:14 -0500 From: "Dr. David Alan Gilbert (git)" Date: Tue, 5 Mar 2019 18:15:43 +0000 Message-Id: <20190305181602.9051-3-dgilbert@redhat.com> In-Reply-To: <20190305181602.9051-1-dgilbert@redhat.com> References: <20190305181602.9051-1-dgilbert@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 02/21] migration/rdma: Fix qemu_rdma_cleanup null check List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, quintela@redhat.com, peterx@redhat.com, marcel.apfelbaum@gmail.com, wei.w.wang@intel.com, yury-kotov@yandex-team.ru, chen.zhang@intel.com From: "Dr. David Alan Gilbert" If the migration fails before the channel is open (e.g. a bad address) we end up in the cleanup with rdma->channel=3D=3DNULL. Spotted by Coverity: CID 1398634 Fixes: fbbaacab2758cb3f32a0 Signed-off-by: Dr. David Alan Gilbert Message-Id: <20190214185351.5927-1-dgilbert@redhat.com> Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Peter Xu Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- migration/rdma.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/migration/rdma.c b/migration/rdma.c index 54a3c11540..9fa3b176eb 100644 --- a/migration/rdma.c +++ b/migration/rdma.c @@ -2321,7 +2321,9 @@ static void qemu_rdma_cleanup(RDMAContext *rdma) rdma->connected =3D false; } =20 - qemu_set_fd_handler(rdma->channel->fd, NULL, NULL, NULL); + if (rdma->channel) { + qemu_set_fd_handler(rdma->channel->fd, NULL, NULL, NULL); + } g_free(rdma->dest_blocks); rdma->dest_blocks =3D NULL; =20 --=20 2.20.1