[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20210705142431-mutt-send-email-mst@kernel.org>
Date: Mon, 5 Jul 2021 14:25:33 -0400
From: "Michael S. Tsirkin" <mst@...hat.com>
To: Xie Yongji <xieyongji@...edance.com>
Cc: jasowang@...hat.com, stefanha@...hat.com, axboe@...nel.dk,
virtualization@...ts.linux-foundation.org,
linux-block@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v4] virtio-blk: Add validation for block size in config
space
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@...edance.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
Powered by blists - more mailing lists