On Tue, Sep 22, 2026 at 05:11:41PM -0400, Yuho Choi wrote:
> virtblk_probe() marks the device ready before revalidating zones and
> adding the disk, and either of those can fail. The out_cleanup_disk path
> they take goes on to delete the virtqueues, but nothing tells the device
> to stop first, so it is still live when the rings are freed.
>
> Reset the device at out_cleanup_disk, which is only reachable after
> virtio_device_ready(). virtblk_remove() and virtblk_freeze_priv() both
> reset before deleting the virtqueues for the same reason.
>
> Fixes: dbb301f91fc8 ("virtio_blk: add error handling support for add_disk()")
> Signed-off-by: Yuho Choi <[email protected]>
> ---
> drivers/block/virtio_blk.c | 1 +
> 1 file changed, 1 insertion(+)
Thanks for the fix!
Reviewed-by: Stefan Hajnoczi <[email protected]>
>
> diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
> index 32bf3ba07a9dc..ed97dafebe164 100644
> --- a/drivers/block/virtio_blk.c
> +++ b/drivers/block/virtio_blk.c
> @@ -1547,6 +1547,7 @@ static int virtblk_probe(struct virtio_device *vdev)
> return 0;
>
> out_cleanup_disk:
> + virtio_reset_device(vdev);
> put_disk(vblk->disk);
> out_free_tags:
> blk_mq_free_tag_set(&vblk->tag_set);
> --
> 2.43.0
>
