Commit 384b557d authored by Maxime Coquelin's avatar Maxime Coquelin Committed by Michael S. Tsirkin
Browse files

vhost: ensure vhost_ops are set before calling iotlb callback 



This patch fixes a crash that happens when vhost-user iommu
support is enabled and vhost-user socket is closed.

When it happens, if an IOTLB invalidation notification is sent
by the IOMMU, vhost_ops's NULL pointer is dereferenced.

Signed-off-by: default avatarMaxime Coquelin <maxime.coquelin@redhat.com>
Reviewed-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 552a1e01

hw/virtio/vhost-backend.c

+8 −2
Original line number Diff line number Diff line
@@ -309,7 +309,10 @@ int vhost_backend_update_device_iotlb(struct vhost_dev *dev, 
        return -EINVAL;

    }



    if (dev->vhost_ops && dev->vhost_ops->vhost_send_device_iotlb_msg)

        return dev->vhost_ops->vhost_send_device_iotlb_msg(dev, &imsg);



    return -ENODEV;

}



int vhost_backend_invalidate_device_iotlb(struct vhost_dev *dev,
@@ -321,7 +324,10 @@ int vhost_backend_invalidate_device_iotlb(struct vhost_dev *dev, 
    imsg.size = len;

    imsg.type = VHOST_IOTLB_INVALIDATE;



    if (dev->vhost_ops && dev->vhost_ops->vhost_send_device_iotlb_msg)

        return dev->vhost_ops->vhost_send_device_iotlb_msg(dev, &imsg);



    return -ENODEV;

}



int vhost_backend_handle_iotlb_msg(struct vhost_dev *dev,