From dffca56ae49c29882f454f658f2334b5d2e57e6a Mon Sep 17 00:00:00 2001 From: yezengruan Date: Fri, 15 Apr 2022 17:26:10 +0800 Subject: [PATCH] fix CVE-2022-26354 and CVE-2022-26353 vhost-vsock: detach the virqueue element in case of error (CVE-2022-26354) virtio-net: fix map leaking on error during receive (CVE-2022-26353) Signed-off-by: yezengruan --- qemu.spec | 8 ++- ...ch-the-virqueue-element-in-case-of-e.patch | 56 +++++++++++++++++++ ...-map-leaking-on-error-during-receive.patch | 39 +++++++++++++ 3 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 vhost-vsock-detach-the-virqueue-element-in-case-of-e.patch create mode 100644 virtio-net-fix-map-leaking-on-error-during-receive.patch diff --git a/qemu.spec b/qemu.spec index 3c2f4f70..b70927d0 100644 --- a/qemu.spec +++ b/qemu.spec @@ -1,6 +1,6 @@ Name: qemu Version: 6.2.0 -Release: 30 +Release: 31 Epoch: 2 Summary: QEMU is a generic and open source machine emulator and virtualizer License: GPLv2 and BSD and MIT and CC-BY-SA-4.0 @@ -239,6 +239,8 @@ Patch0225: coro-support-live-patch-for-libcare.patch Patch0226: qemu-img-create-cache-paramter-only-use-for-reg-file.patch Patch0227: scsi-bus-fix-incorrect-call-for-blk_error_retry_rese.patch Patch0228: Revert-monitor-limit-io-error-qmp-event-to-at-most-o.patch +Patch0229: vhost-vsock-detach-the-virqueue-element-in-case-of-e.patch +Patch0230: virtio-net-fix-map-leaking-on-error-during-receive.patch BuildRequires: flex BuildRequires: gcc @@ -699,6 +701,10 @@ getent passwd qemu >/dev/null || \ %endif %changelog +* Fri Apr 15 2022 yezengruan +- vhost-vsock: detach the virqueue element in case of error (CVE-2022-26354) +- virtio-net: fix map leaking on error during receive (CVE-2022-26353) + * Wed Mar 30 2022 yezengruan - scsi-bus: fix incorrect call for blk_error_retry_reset_timeout() - Revert "monitor: limit io error qmp event to at most once per 60s" diff --git a/vhost-vsock-detach-the-virqueue-element-in-case-of-e.patch b/vhost-vsock-detach-the-virqueue-element-in-case-of-e.patch new file mode 100644 index 00000000..019f41be --- /dev/null +++ b/vhost-vsock-detach-the-virqueue-element-in-case-of-e.patch @@ -0,0 +1,56 @@ +From 1362d692f9fac12d5ee37a44163c652bb58075eb Mon Sep 17 00:00:00 2001 +From: Stefano Garzarella +Date: Mon, 28 Feb 2022 10:50:58 +0100 +Subject: [PATCH 1/2] vhost-vsock: detach the virqueue element in case of error + +In vhost_vsock_common_send_transport_reset(), if an element popped from +the virtqueue is invalid, we should call virtqueue_detach_element() to +detach it from the virtqueue before freeing its memory. + +Fixes: fc0b9b0e1c ("vhost-vsock: add virtio sockets device") +Fixes: CVE-2022-26354 +Cc: qemu-stable@nongnu.org +Reported-by: VictorV +Signed-off-by: Stefano Garzarella +Message-Id: <20220228095058.27899-1-sgarzare@redhat.com> +Reviewed-by: Stefan Hajnoczi +Reviewed-by: Michael S. Tsirkin +Signed-off-by: Michael S. Tsirkin +--- + hw/virtio/vhost-vsock-common.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/hw/virtio/vhost-vsock-common.c b/hw/virtio/vhost-vsock-common.c +index 3f3771274e..ed706681ac 100644 +--- a/hw/virtio/vhost-vsock-common.c ++++ b/hw/virtio/vhost-vsock-common.c +@@ -153,19 +153,23 @@ static void vhost_vsock_common_send_transport_reset(VHostVSockCommon *vvc) + if (elem->out_num) { + error_report("invalid vhost-vsock event virtqueue element with " + "out buffers"); +- goto out; ++ goto err; + } + + if (iov_from_buf(elem->in_sg, elem->in_num, 0, + &event, sizeof(event)) != sizeof(event)) { + error_report("vhost-vsock event virtqueue element is too short"); +- goto out; ++ goto err; + } + + virtqueue_push(vq, elem, sizeof(event)); + virtio_notify(VIRTIO_DEVICE(vvc), vq); + +-out: ++ g_free(elem); ++ return; ++ ++err: ++ virtqueue_detach_element(vq, elem, 0); + g_free(elem); + } + +-- +2.27.0 + diff --git a/virtio-net-fix-map-leaking-on-error-during-receive.patch b/virtio-net-fix-map-leaking-on-error-during-receive.patch new file mode 100644 index 00000000..b8b59dc1 --- /dev/null +++ b/virtio-net-fix-map-leaking-on-error-during-receive.patch @@ -0,0 +1,39 @@ +From df98392ee2334462e9f1007b3c9f7a14938bd9ab Mon Sep 17 00:00:00 2001 +From: Jason Wang +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 +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 +Signed-off-by: Jason Wang +--- + 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 e887589a30..d33da9b7ef 100644 +--- a/hw/net/virtio-net.c ++++ b/hw/net/virtio-net.c +@@ -1883,6 +1883,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.27.0 + -- Gitee