From: "Michael S. Tsirkin" <mst@redhat.com>
To: Jason Wang <jasowang@redhat.com>
Cc: mpe@ellerman.id.au, qemu-devel@nongnu.org, david@redhat.com
Subject: Re: [PATCH 2/2] virtio-balloon: correct used length
Date: Thu, 25 Nov 2021 11:14:42 -0500 [thread overview]
Message-ID: <20211125111055-mutt-send-email-mst@kernel.org> (raw)
In-Reply-To: <20211125022046.10433-2-jasowang@redhat.com>
On Thu, Nov 25, 2021 at 10:20:46AM +0800, Jason Wang wrote:
> Spec said:
>
> "and len the total of bytes written into the buffer."
>
> For inflateq, deflateq and statsq, we don't process in_sg so the used
> length should be zero. For free_page_vq, since the pages could be
> changed in the destination, we should make all pages used for safety.
Yea, about that, I know I said it, but I was wrong, sorry.
Spec says this:
\field{len} is particularly useful
for drivers using untrusted buffers: if a driver does not know exactly
how much has been written by the device, the driver would have to zero
the buffer in advance to ensure no data leakage occurs.
For example, a network driver may hand a received buffer directly to
an unprivileged userspace application. If the network device has not
overwritten the bytes which were in that buffer, this could leak the
contents of freed memory from other processes to the application.
In other words, device must guarantee that used length was
written into. Since we don't know that, we really should
write 0 there, and the fact we don't is a spec violation.
> Signed-off-by: Jason Wang <jasowang@redhat.com>
> ---
> hw/virtio/virtio-balloon.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
> index 17de2558cb..fb4426ac0c 100644
> --- a/hw/virtio/virtio-balloon.c
> +++ b/hw/virtio/virtio-balloon.c
> @@ -231,7 +231,7 @@ static void balloon_stats_poll_cb(void *opaque)
> return;
> }
>
> - virtqueue_push(s->svq, s->stats_vq_elem, s->stats_vq_offset);
> + virtqueue_push(s->svq, s->stats_vq_elem, 0);
> virtio_notify(vdev, s->svq);
> g_free(s->stats_vq_elem);
> s->stats_vq_elem = NULL;
> @@ -438,7 +438,7 @@ static void virtio_balloon_handle_output(VirtIODevice *vdev, VirtQueue *vq)
> memory_region_unref(section.mr);
> }
>
> - virtqueue_push(vq, elem, offset);
> + virtqueue_push(vq, elem, 0);
> virtio_notify(vdev, vq);
> g_free(elem);
> virtio_balloon_pbp_free(&pbp);
> @@ -510,6 +510,7 @@ static bool get_free_page_hints(VirtIOBalloon *dev)
> VirtIODevice *vdev = VIRTIO_DEVICE(dev);
> VirtQueue *vq = dev->free_page_vq;
> bool ret = true;
> + size_t used = 0;
> int i;
>
> while (dev->block_iothread) {
> @@ -548,11 +549,12 @@ static bool get_free_page_hints(VirtIOBalloon *dev)
> for (i = 0; i < elem->in_num; i++) {
> qemu_guest_free_page_hint(elem->in_sg[i].iov_base,
> elem->in_sg[i].iov_len);
> + used += elem->in_sg[i].iov_len;
> }
> }
>
> out:
> - virtqueue_push(vq, elem, 1);
> + virtqueue_push(vq, elem, used);
> g_free(elem);
> return ret;
> }
> --
> 2.25.1
next prev parent reply other threads:[~2021-11-25 16:16 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-25 2:20 [PATCH 1/2] virito-balloon: process all in sgs for free_page_vq Jason Wang
2021-11-25 2:20 ` [PATCH 2/2] virtio-balloon: correct used length Jason Wang
2021-11-25 16:14 ` Michael S. Tsirkin [this message]
2021-11-26 2:45 ` Jason Wang
2021-11-26 7:36 ` Michael S. Tsirkin
2021-11-29 2:48 ` Jason Wang
2021-11-25 8:28 ` [PATCH 1/2] virito-balloon: process all in sgs for free_page_vq David Hildenbrand
2021-11-25 16:09 ` Michael S. Tsirkin
2021-11-25 16:11 ` David Hildenbrand
2021-11-26 1:21 ` Wang, Wei W
2021-11-26 1:42 ` Michael S. Tsirkin
2021-11-26 2:31 ` Jason Wang
2021-11-26 2:40 ` Wang, Wei W
2021-11-26 2:43 ` Jason Wang
2021-11-25 8:34 ` Philippe Mathieu-Daudé
2021-11-25 16:10 ` Michael S. Tsirkin
2021-11-26 2:42 ` Jason Wang
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=20211125111055-mutt-send-email-mst@kernel.org \
--to=mst@redhat.com \
--cc=david@redhat.com \
--cc=jasowang@redhat.com \
--cc=mpe@ellerman.id.au \
--cc=qemu-devel@nongnu.org \
/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).