]> git.proxmox.com Git - mirror_qemu.git/commitdiff
migration/rdma: Fix qemu_rdma_cleanup null check
authorDr. David Alan Gilbert <dgilbert@redhat.com>
Thu, 14 Feb 2019 18:53:51 +0000 (18:53 +0000)
committerDr. David Alan Gilbert <dgilbert@redhat.com>
Wed, 6 Mar 2019 10:49:17 +0000 (10:49 +0000)
If the migration fails before the channel is open (e.g. a bad
address) we end up in the cleanup with rdma->channel==NULL.

Spotted by Coverity: CID 1398634
Fixes: fbbaacab2758cb3f32a0
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20190214185351.5927-1-dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
migration/rdma.c

index 54a3c11540d947a741b97afdcef8cf68bc70da4a..9fa3b176eb6abd4230608bd75a8f2ccba799e309 100644 (file)
@@ -2321,7 +2321,9 @@ static void qemu_rdma_cleanup(RDMAContext *rdma)
         rdma->connected = false;
     }
 
-    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 = NULL;