aboutsummaryrefslogtreecommitdiff
path: root/hw/net
diff options
context:
space:
mode:
authorJason Wang <jasowang@redhat.com>2022-03-08 10:42:51 +0800
committerJason Wang <jasowang@redhat.com>2022-03-15 13:57:44 +0800
commitabe300d9d894f7138e1af7c8e9c88c04bfe98b37 (patch)
tree28c9fda820a74f7b5f8aa26ed36c5003da2c2cd9 /hw/net
parent352998df1c53b366413690d95b35f76d0721ebed (diff)
downloadqemu-abe300d9d894f7138e1af7c8e9c88c04bfe98b37.zip
qemu-abe300d9d894f7138e1af7c8e9c88c04bfe98b37.tar.gz
qemu-abe300d9d894f7138e1af7c8e9c88c04bfe98b37.tar.bz2
virtio-net: fix map leaking on error during receive
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>
Diffstat (limited to 'hw/net')
-rw-r--r--hw/net/virtio-net.c1
1 files changed, 1 insertions, 0 deletions
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]);
}