From: Jason Wang <jasowang@redhat.com>
To: qemu-devel@nongnu.org, peter.maydell@linaro.org
Cc: Victor Tom <vv474172261@gmail.com>,
Jason Wang <jasowang@redhat.com>,
qemu-stable@nongnu.org, "Michael S . Tsirkin" <mst@redhat.com>
Subject: [PULL V3 01/15] virtio-net: fix map leaking on error during receive
Date: Tue, 15 Mar 2022 14:14:06 +0800 [thread overview]
Message-ID: <20220315061420.31910-2-jasowang@redhat.com> (raw)
In-Reply-To: <20220315061420.31910-1-jasowang@redhat.com>
Commit bedd7e93d0196 ("virtio-net: fix use after unmap/free for sg")
tries to fix the use after free of the sg by caching the virtqueue
elements in an array and unmap them at once after receiving the
packets, But it forgot to unmap the cached elements on error which
will lead to leaking of mapping and other unexpected results.
Fixing this by detaching the cached elements on error. This addresses
CVE-2022-26353.
Reported-by: Victor Tom <vv474172261@gmail.com>
Cc: qemu-stable@nongnu.org
Fixes: CVE-2022-26353
Fixes: bedd7e93d0196 ("virtio-net: fix use after unmap/free for sg")
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
hw/net/virtio-net.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index b02a063..2087516 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -1870,6 +1870,7 @@ static ssize_t virtio_net_receive_rcu(NetClientState *nc, const uint8_t *buf,
err:
for (j = 0; j < i; j++) {
+ virtqueue_detach_element(q->rx_vq, elems[j], lens[j]);
g_free(elems[j]);
}
--
2.7.4
next prev parent reply other threads:[~2022-03-15 6:17 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-15 6:14 [PULL V3 00/15] Net patches Jason Wang
2022-03-15 6:14 ` Jason Wang [this message]
2022-03-15 6:14 ` [PULL V3 02/15] vhost: Add VhostShadowVirtqueue Jason Wang
2022-03-15 6:14 ` [PULL V3 03/15] vhost: Add Shadow VirtQueue kick forwarding capabilities Jason Wang
2022-03-15 6:14 ` [PULL V3 04/15] vhost: Add Shadow VirtQueue call " Jason Wang
2022-03-15 6:14 ` [PULL V3 05/15] vhost: Add vhost_svq_valid_features to shadow vq Jason Wang
2022-03-15 6:14 ` [PULL V3 06/15] virtio: Add vhost_svq_get_vring_addr Jason Wang
2022-03-15 6:14 ` [PULL V3 07/15] vdpa: adapt vhost_ops callbacks to svq Jason Wang
2022-03-15 6:14 ` [PULL V3 08/15] vhost: Shadow virtqueue buffers forwarding Jason Wang
2022-05-12 15:47 ` Peter Maydell
2022-05-12 18:01 ` Eugenio Perez Martin
2022-03-15 6:14 ` [PULL V3 09/15] util: Add iova_tree_alloc_map Jason Wang
2022-03-15 6:14 ` [PULL V3 10/15] util: add iova_tree_find_iova Jason Wang
2022-03-15 6:14 ` [PULL V3 11/15] vhost: Add VhostIOVATree Jason Wang
2022-03-15 6:14 ` [PULL V3 12/15] vdpa: Add custom IOTLB translations to SVQ Jason Wang
2022-03-15 6:14 ` [PULL V3 13/15] vdpa: Adapt vhost_vdpa_get_vring_base " Jason Wang
2022-03-15 6:14 ` [PULL V3 14/15] vdpa: Never set log_base addr if SVQ is enabled Jason Wang
2022-03-15 6:14 ` [PULL V3 15/15] vdpa: Expose VHOST_F_LOG_ALL on SVQ Jason Wang
2022-03-15 11:26 ` [PULL V3 00/15] Net patches Peter Maydell
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=20220315061420.31910-2-jasowang@redhat.com \
--to=jasowang@redhat.com \
--cc=mst@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-stable@nongnu.org \
--cc=vv474172261@gmail.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).