[PATCH v7 04/12] virtio-blk: Add validation for block size in config space
From: Xie Yongji <hidden>
Date: 2021-05-17 09:56:35
Also in:
kvm, linux-fsdevel, linux-iommu, lkml
Subsystem:
block layer, the rest, virtio block and scsi drivers, virtio core · Maintainers:
Jens Axboe, Linus Torvalds, "Michael S. Tsirkin", Jason Wang
This ensures that we will not use an invalid block size in config space (might come from an untrusted device). Signed-off-by: Xie Yongji <redacted> --- drivers/block/virtio_blk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index ebb4d3fe803f..c848aa36d49b 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c@@ -826,7 +826,7 @@ static int virtblk_probe(struct virtio_device *vdev) err = virtio_cread_feature(vdev, VIRTIO_BLK_F_BLK_SIZE, struct virtio_blk_config, blk_size, &blk_size); - if (!err) + if (!err && blk_size > 0 && blk_size <= max_size) blk_queue_logical_block_size(q, blk_size); else blk_size = queue_logical_block_size(q);
--
2.11.0