40b9b28df1
hw/block/fdc: Extract blk_create_empty_drive() hw/block/fdc: Kludge missing floppy drive to fix CVE-2021-20196 tests/fdc-test: Add a regression test for CVE-2021-20196 display/qxl-render: fix race condition in qxl_cursor (CVE-2021-4207) ui/cursor: fix integer overflow in cursor_alloc (CVE-2021-4206) Signed-off-by: yezengruan <yezengruan@huawei.com> Signed-off-by: bobychen <boby.chen@huawei.com>
39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
From 5b4d6c4605900ecc22135af5a904270931220a4f Mon Sep 17 00:00:00 2001
|
|
From: Mauro Matteo Cascella <mcascell@redhat.com>
|
|
Date: Thu, 7 Apr 2022 10:11:06 +0200
|
|
Subject: [PATCH 4/5] display/qxl-render: fix race condition in qxl_cursor
|
|
(CVE-2021-4207)
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Avoid fetching 'width' and 'height' a second time to prevent possible
|
|
race condition. Refer to security advisory
|
|
https://starlabs.sg/advisories/22-4207/ for more information.
|
|
|
|
Fixes: CVE-2021-4207
|
|
Signed-off-by: Mauro Matteo Cascella <mcascell@redhat.com>
|
|
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
|
|
Message-Id: <20220407081106.343235-1-mcascell@redhat.com>
|
|
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
---
|
|
hw/display/qxl-render.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/hw/display/qxl-render.c b/hw/display/qxl-render.c
|
|
index 14ad2b352d..4a63c382f6 100644
|
|
--- a/hw/display/qxl-render.c
|
|
+++ b/hw/display/qxl-render.c
|
|
@@ -259,7 +259,7 @@ static QEMUCursor *qxl_cursor(PCIQXLDevice *qxl, QXLCursor *cursor,
|
|
}
|
|
break;
|
|
case SPICE_CURSOR_TYPE_ALPHA:
|
|
- size = sizeof(uint32_t) * cursor->header.width * cursor->header.height;
|
|
+ size = sizeof(uint32_t) * c->width * c->height;
|
|
qxl_unpack_chunks(c->data, size, qxl, &cursor->chunk, group_id);
|
|
if (qxl->debug > 2) {
|
|
cursor_print_ascii_art(c, "qxl/alpha");
|
|
--
|
|
2.27.0
|
|
|