Commit e82cdba3 authored by Stefano Garzarella's avatar Stefano Garzarella Committed by Michael S. Tsirkin
Browse files

vhost-vsock: fix double close() in the realize() error path 



vhost_dev_cleanup() closes the vhostfd parameter passed to
vhost_dev_init(), so this patch avoids closing it twice in
the vhost_vsock_device_realize() error path.

Signed-off-by: default avatarStefano Garzarella <sgarzare@redhat.com>
Message-Id: <20200331075910.42529-1-sgarzare@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 17e89077

hw/virtio/vhost-vsock.c

+5 −1
Original line number Diff line number Diff line
@@ -364,12 +364,16 @@ static void vhost_vsock_device_realize(DeviceState *dev, Error **errp) 


err_vhost_dev:

    vhost_dev_cleanup(&vsock->vhost_dev);

    /* vhost_dev_cleanup() closes the vhostfd passed to vhost_dev_init() */

    vhostfd = -1;

err_virtio:

    virtio_delete_queue(vsock->recv_vq);

    virtio_delete_queue(vsock->trans_vq);

    virtio_delete_queue(vsock->event_vq);

    virtio_cleanup(vdev);

    if (vhostfd >= 0) {

        close(vhostfd);

    }

    return;

}