From: Max Gurtovoy <mgurtovoy@nvidia.com>
To: Yongji Xie <xieyongji@bytedance.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>,
Jason Wang <jasowang@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
virtualization <virtualization@lists.linux-foundation.org>,
<linux-block@vger.kernel.org>,
linux-kernel <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v5] virtio-blk: Add validation for block size in config space
Date: Mon, 23 Aug 2021 11:07:00 +0300 [thread overview]
Message-ID: <dc8e7f6d-9aa6-58c6-97f7-c30391aeac5d@nvidia.com> (raw)
In-Reply-To: <CACycT3sNRRBrSTJOUr=POc-+BOAgfT7+qgFE2BLBTGJ30cZVsQ@mail.gmail.com>
On 8/23/2021 7:31 AM, Yongji Xie wrote:
> On Mon, Aug 23, 2021 at 7:17 AM Max Gurtovoy <mgurtovoy@nvidia.com> wrote:
>>
>> On 8/9/2021 1:16 PM, Xie Yongji wrote:
>>> An untrusted device might presents an invalid block size
>>> in configuration space. This tries to add validation for it
>>> in the validate callback and clear the VIRTIO_BLK_F_BLK_SIZE
>>> feature bit if the value is out of the supported range.
>> This is not clear to me. What is untrusted device ? is it a buggy device ?
>>
> A buggy device, the devices in an encrypted VM, or a userspace device
> created by VDUSE [1].
>
> [1] https://lore.kernel.org/kvm/20210818120642.165-1-xieyongji@bytedance.com/
if it's a userspace device, why don't you fix its control path code
instead of adding workarounds in the kernel driver ?
>
>> What is the return value for the blk_size in this case that you try to
>> override ?
>>
> The value that is larger than PAGE_SIZE. I think the block layer can
> not handle the block size that is larger than PAGE_SIZE correctly,
> e.g. in block_read_full_page().
>
>>> And we also double check the value in virtblk_probe() in
>>> case that it's changed after the validation.
>>>
>>> Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
>>> ---
>>> drivers/block/virtio_blk.c | 39 +++++++++++++++++++++++++++++++++------
>>> 1 file changed, 33 insertions(+), 6 deletions(-)
>>>
>>> diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
>>> index 4b49df2dfd23..afb37aac09e8 100644
>>> --- a/drivers/block/virtio_blk.c
>>> +++ b/drivers/block/virtio_blk.c
>>> @@ -692,6 +692,28 @@ static const struct blk_mq_ops virtio_mq_ops = {
>>> static unsigned int virtblk_queue_depth;
>>> module_param_named(queue_depth, virtblk_queue_depth, uint, 0444);
>>>
>>> +static int virtblk_validate(struct virtio_device *vdev)
>>> +{
>>> + u32 blk_size;
>>> +
>>> + if (!vdev->config->get) {
>>> + dev_err(&vdev->dev, "%s failure: config access disabled\n",
>>> + __func__);
>>> + return -EINVAL;
>>> + }
>>> +
>>> + if (!virtio_has_feature(vdev, VIRTIO_BLK_F_BLK_SIZE))
>>> + return 0;
>>> +
>>> + blk_size = virtio_cread32(vdev,
>>> + offsetof(struct virtio_blk_config, blk_size));
>>> +
>>> + if (blk_size < SECTOR_SIZE || blk_size > PAGE_SIZE)
>>> + __virtio_clear_bit(vdev, VIRTIO_BLK_F_BLK_SIZE);
>> is it PAGE_SIZE or SZ_4K ?
>>
>> Do we support a 64K blk size (PPC PAGE_SIZE)
>>
> I think PAGE_SIZE should be OK here. I didn't see a hard 4K limitation
> in the kernel. NBD did the same check:
>
> static int nbd_set_size(struct nbd_device *nbd, loff_t bytesize, loff_t blksize)
> {
> if (!blksize)
> blksize = NBD_DEF_BLKSIZE;
> if (blksize < 512 || blksize > PAGE_SIZE || !is_power_of_2(blksize))
> return -EINVAL;
>
> Thanks,
> Yongji
next prev parent reply other threads:[~2021-08-23 8:07 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-09 10:16 [PATCH v5] virtio-blk: Add validation for block size in config space Xie Yongji
2021-08-10 3:05 ` Jason Wang
2021-08-10 4:59 ` Yongji Xie
2021-08-10 6:59 ` Jason Wang
2021-08-22 23:17 ` Max Gurtovoy
2021-08-23 4:31 ` Yongji Xie
2021-08-23 8:07 ` Max Gurtovoy [this message]
2021-08-23 8:35 ` Yongji Xie
2021-08-23 9:04 ` Max Gurtovoy
2021-08-23 9:27 ` Yongji Xie
2021-08-23 9:38 ` Max Gurtovoy
2021-08-23 10:33 ` Yongji Xie
2021-08-23 10:45 ` Max Gurtovoy
2021-08-23 11:41 ` Yongji Xie
2021-08-23 12:13 ` Michael S. Tsirkin
2021-08-23 12:40 ` Yongji Xie
2021-08-23 16:02 ` Michael S. Tsirkin
2021-08-23 22:31 ` Max Gurtovoy
2021-08-24 2:47 ` Jason Wang
2021-08-24 10:11 ` Max Gurtovoy
2021-08-24 12:52 ` Yongji Xie
2021-08-24 13:30 ` Max Gurtovoy
2021-08-24 13:38 ` Yongji Xie
2021-08-24 13:48 ` Max Gurtovoy
2021-10-04 15:27 ` Michael S. Tsirkin
2021-10-04 15:39 ` Michael S. Tsirkin
2021-10-05 15:52 ` Yongji Xie
2021-10-05 10:42 ` Michael S. Tsirkin
2021-10-05 15:45 ` Yongji Xie
2021-10-05 18:26 ` Martin K. Petersen
2021-10-11 11:40 ` Christoph Hellwig
2021-10-13 12:21 ` Michael S. Tsirkin
2021-10-13 12:34 ` Yongji Xie
2021-10-13 12:51 ` Michael S. Tsirkin
2021-10-13 12:59 ` Yongji Xie
2021-10-05 15:24 ` Yongji Xie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=dc8e7f6d-9aa6-58c6-97f7-c30391aeac5d@nvidia.com \
--to=mgurtovoy@nvidia.com \
--cc=jasowang@redhat.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=stefanha@redhat.com \
--cc=virtualization@lists.linux-foundation.org \
--cc=xieyongji@bytedance.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).