Commit cf75e268 authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert
Browse files

migration/rdma: Fix qemu_rdma_cleanup null check 



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: fbbaacab
Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Message-Id: <20190214185351.5927-1-dgilbert@redhat.com>
Signed-off-by: default avatarDr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: default avatarPeter Xu <peterx@redhat.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
parent c3c5eae6

migration/rdma.c

+3 −1
Original line number Diff line number Diff line
@@ -2321,7 +2321,9 @@ static void qemu_rdma_cleanup(RDMAContext *rdma) 
        rdma->connected = false;

    }



    if (rdma->channel) {

        qemu_set_fd_handler(rdma->channel->fd, NULL, NULL, NULL);

    }

    g_free(rdma->dest_blocks);

    rdma->dest_blocks = NULL;