* [PATCH v4] virtio-blk: Add validation for block size in config space
@ 2021-07-05 10:00 Xie Yongji
2021-07-05 18:25 ` Michael S. Tsirkin
0 siblings, 1 reply; 2+ messages in thread
From: Xie Yongji @ 2021-07-05 10:00 UTC (permalink / raw)
To: mst, jasowang, stefanha, axboe; +Cc: virtualization, linux-block, linux-kernel
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 <xieyongji@bytedance.com>
---
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 e4bd3b1fc3c2..e9d7747c3cc0 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -819,7 +819,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 >= SECTOR_SIZE && blk_size <= PAGE_SIZE)
blk_queue_logical_block_size(q, blk_size);
else
blk_size = queue_logical_block_size(q);
--
2.11.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v4] virtio-blk: Add validation for block size in config space
2021-07-05 10:00 [PATCH v4] virtio-blk: Add validation for block size in config space Xie Yongji
@ 2021-07-05 18:25 ` Michael S. Tsirkin
0 siblings, 0 replies; 2+ messages in thread
From: Michael S. Tsirkin @ 2021-07-05 18:25 UTC (permalink / raw)
To: Xie Yongji
Cc: jasowang, stefanha, axboe, virtualization, linux-block, linux-kernel
On Mon, Jul 05, 2021 at 06:00:06PM +0800, Xie Yongji wrote:
> 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 <xieyongji@bytedance.com>
I replied on v3.
Silently ignoring what hypervisor said is not a good idea.
> ---
> 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 e4bd3b1fc3c2..e9d7747c3cc0 100644
> --- a/drivers/block/virtio_blk.c
> +++ b/drivers/block/virtio_blk.c
> @@ -819,7 +819,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 >= SECTOR_SIZE && blk_size <= PAGE_SIZE)
> blk_queue_logical_block_size(q, blk_size);
> else
> blk_size = queue_logical_block_size(q);
> --
> 2.11.0
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-07-05 18:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-05 10:00 [PATCH v4] virtio-blk: Add validation for block size in config space Xie Yongji
2021-07-05 18:25 ` Michael S. Tsirkin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).