| CVE: CVE-2022-26353 |
| Upstream-Status: Backport |
| Signed-off-by: Ross Burton <ross.burton@arm.com> |
| |
| From 4d65ecbddd16f38a8cf23b3053ca5c3594f8d4a4 Mon Sep 17 00:00:00 2001 |
| From: Jason Wang <jasowang@redhat.com> |
| Date: Tue, 8 Mar 2022 10:42:51 +0800 |
| Subject: [PATCH 2/2] 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> |
| --- |
| 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 f2014d5ea0..e1f4748831 100644 |
| --- a/hw/net/virtio-net.c |
| +++ b/hw/net/virtio-net.c |
| @@ -1862,6 +1862,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.25.1 |
| |