From: "Pierre-Clément Tosi" <ptosi@google.com>
To: Andrew Scull <ascull@google.com>
Cc: u-boot@lists.denx.de, sjg@chromium.org, bmeng.cn@gmail.com,
adelva@google.com, keirf@google.com,
Sughosh Ganu <sughosh.ganu@linaro.org>
Subject: Re: [PATCH 10/11] virtio: rng: Check length before copying
Date: Wed, 6 Apr 2022 15:18:38 +0100 [thread overview]
Message-ID: <20220406141838.jctudjhaypgncdwu@google.com> (raw)
In-Reply-To: <20220331100949.3637425-11-ascull@google.com>
Hi,
On Thu, Mar 31, 2022 at 10:09:48AM +0000, Andrew Scull wrote:
> Check the length of data written by the device is consistent with the
> size of the buffers to avoid out-of-bounds memory accesses in case
> values aren't consistent.
>
> Signed-off-by: Andrew Scull <ascull@google.com>
> Cc: Sughosh Ganu <sughosh.ganu@linaro.org>
> ---
> drivers/virtio/virtio_rng.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/virtio/virtio_rng.c b/drivers/virtio/virtio_rng.c
> index 9314c0a03e..b85545c2ee 100644
> --- a/drivers/virtio/virtio_rng.c
> +++ b/drivers/virtio/virtio_rng.c
> @@ -41,6 +41,9 @@ static int virtio_rng_read(struct udevice *dev, void *data, size_t len)
> while (!virtqueue_get_buf(priv->rng_vq, &rsize))
> ;
>
> + if (rsize > sg.length)
> + return -EIO;
> +
Although this patch addresses a legitimate concern, could we instead aim for
strengthening the lower-level virtio building blocks (e.g. virtqueue_get_buf())
so that higher-level virtio device drivers such as virtio-{rng,console,net,...}
don't have to be littered with checks of this nature? Could this be achieved by
using the shadow copy introduced in [PATCH 03/11]?
> memcpy(ptr, buf, rsize);
> len -= rsize;
> ptr += rsize;
> --
> 2.35.1.1094.g7c7d902a7c-goog
>
Thanks,
--
Pierre
next prev parent reply other threads:[~2022-04-06 14:18 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-31 10:09 [PATCH 00/11] virtio: Harden and test vring Andrew Scull
2022-03-31 10:09 ` [PATCH 01/11] virtio_ring: Merge identical variables Andrew Scull
2022-04-07 7:03 ` Heinrich Schuchardt
2022-04-11 18:35 ` Simon Glass
2022-03-31 10:09 ` [PATCH 02/11] virtio_ring: Add helper to attach vring descriptor Andrew Scull
2022-04-11 18:35 ` Simon Glass
2022-03-31 10:09 ` [PATCH 03/11] virtio_ring: Maintain a shadow copy of descriptors Andrew Scull
2022-04-11 18:35 ` Simon Glass
2022-03-31 10:09 ` [PATCH 04/11] virtio_ring: Check used descriptors are chain heads Andrew Scull
2022-04-11 18:35 ` Simon Glass
2022-03-31 10:09 ` [PATCH 05/11] dm: test: virtio: Test the virtio ring Andrew Scull
2022-04-11 18:35 ` Simon Glass
2022-03-31 10:09 ` [PATCH 06/11] virtio: sandbox: Fix device features bitfield Andrew Scull
2022-04-11 18:35 ` Simon Glass
2022-03-31 10:09 ` [PATCH 07/11] test: dm: virtio: Test notify before del_vqs Andrew Scull
2022-04-11 18:35 ` Simon Glass
2022-03-31 10:09 ` [PATCH 08/11] virtio: sandbox: Bind RNG rather than block device Andrew Scull
2022-04-07 7:20 ` Heinrich Schuchardt
2022-04-07 10:16 ` Andrew Scull
2022-04-11 18:35 ` Simon Glass
2022-03-31 10:09 ` [PATCH 09/11] test: dm: virtio: Test virtio device driver probing Andrew Scull
2022-04-11 18:35 ` Simon Glass
2022-03-31 10:09 ` [PATCH 10/11] virtio: rng: Check length before copying Andrew Scull
2022-04-06 14:18 ` Pierre-Clément Tosi [this message]
2022-04-07 10:09 ` Andrew Scull
2022-04-11 18:35 ` Simon Glass
2022-03-31 10:09 ` [PATCH 11/11] RFC: test: dm: virtio: Test virtio-rng with faked device Andrew Scull
2022-04-11 18:35 ` Simon Glass
2022-04-12 10:33 ` Andrew Scull
2022-04-12 18:10 ` [PATCH 00/11] virtio: Harden and test vring Tom Rini
2022-04-12 22:49 ` Andrew Scull
2022-04-12 23:11 ` Tom Rini
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=20220406141838.jctudjhaypgncdwu@google.com \
--to=ptosi@google.com \
--cc=adelva@google.com \
--cc=ascull@google.com \
--cc=bmeng.cn@gmail.com \
--cc=keirf@google.com \
--cc=sjg@chromium.org \
--cc=sughosh.ganu@linaro.org \
--cc=u-boot@lists.denx.de \
/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