mirror of
https://git.yoctoproject.org/poky
synced 2026-06-03 01:40:07 +00:00
qemu: Backport fix CVE-2023-3180
Upstream-Status: Backport from [https://gitlab.com/qemu-project/qemu/-/commit/9d38a8434721a6479fe03fb5afb150ca793d3980] CVE: CVE-2023-3180 (From OE-Core rev: edbc17315927a711aa9fae7c6cfba61cbf8ab5ad) Signed-off-by: Ashish Sharma <asharma@mvista.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
committed by
Steve Sakoman
parent
0485ee7a6b
commit
b48424988a
@@ -139,6 +139,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
|
|||||||
file://hw-display-qxl-Pass-requested-buffer-size-to-qxl_phy.patch \
|
file://hw-display-qxl-Pass-requested-buffer-size-to-qxl_phy.patch \
|
||||||
file://CVE-2023-0330.patch \
|
file://CVE-2023-0330.patch \
|
||||||
file://CVE-2023-3354.patch \
|
file://CVE-2023-3354.patch \
|
||||||
|
file://CVE-2023-3180.patch \
|
||||||
"
|
"
|
||||||
UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
|
UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,49 @@
|
|||||||
|
From 9d38a8434721a6479fe03fb5afb150ca793d3980 Mon Sep 17 00:00:00 2001
|
||||||
|
From: zhenwei pi <pizhenwei@bytedance.com>
|
||||||
|
Date: Thu, 3 Aug 2023 10:43:13 +0800
|
||||||
|
Subject: [PATCH] virtio-crypto: verify src&dst buffer length for sym request
|
||||||
|
|
||||||
|
For symmetric algorithms, the length of ciphertext must be as same
|
||||||
|
as the plaintext.
|
||||||
|
The missing verification of the src_len and the dst_len in
|
||||||
|
virtio_crypto_sym_op_helper() may lead buffer overflow/divulged.
|
||||||
|
|
||||||
|
This patch is originally written by Yiming Tao for QEMU-SECURITY,
|
||||||
|
resend it(a few changes of error message) in qemu-devel.
|
||||||
|
|
||||||
|
Fixes: CVE-2023-3180
|
||||||
|
Fixes: 04b9b37edda("virtio-crypto: add data queue processing handler")
|
||||||
|
Cc: Gonglei <arei.gonglei@huawei.com>
|
||||||
|
Cc: Mauro Matteo Cascella <mcascell@redhat.com>
|
||||||
|
Cc: Yiming Tao <taoym@zju.edu.cn>
|
||||||
|
Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
|
||||||
|
Message-Id: <20230803024314.29962-2-pizhenwei@bytedance.com>
|
||||||
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
||||||
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
||||||
|
|
||||||
|
Upstream-Status: Backport from [https://gitlab.com/qemu-project/qemu/-/commit/9d38a8434721a6479fe03fb5afb150ca793d3980]
|
||||||
|
CVE: CVE-2023-3180
|
||||||
|
Signed-off-by: Ashish Sharma <asharma@mvista.com>
|
||||||
|
|
||||||
|
hw/virtio/virtio-crypto.c | 5 +++++
|
||||||
|
1 file changed, 5 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/hw/virtio/virtio-crypto.c b/hw/virtio/virtio-crypto.c
|
||||||
|
index 44faf5a522b..13aec771e11 100644
|
||||||
|
--- a/hw/virtio/virtio-crypto.c
|
||||||
|
+++ b/hw/virtio/virtio-crypto.c
|
||||||
|
@@ -634,6 +634,11 @@ virtio_crypto_sym_op_helper(VirtIODevice *vdev,
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ if (unlikely(src_len != dst_len)) {
|
||||||
|
+ virtio_error(vdev, "sym request src len is different from dst len");
|
||||||
|
+ return NULL;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
max_len = (uint64_t)iv_len + aad_len + src_len + dst_len + hash_result_len;
|
||||||
|
if (unlikely(max_len > vcrypto->conf.max_size)) {
|
||||||
|
virtio_error(vdev, "virtio-crypto too big length");
|
||||||
|
--
|
||||||
|
GitLab
|
||||||
|
|
||||||
Reference in New Issue
Block a user