From: Mauro Matteo Cascella <mcascell@redhat.com>
Date: Thu, 7 Apr 2022 08:11:06 +0000 (+0200)
Subject: display/qxl-render: fix race condition in qxl_cursor (CVE-2021-4207)
X-Git-Tag: v7.0.0-rc4~2^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9569f5cb5b4bffa9d3ebc8ba7da1e03830a9a895;p=thirdparty%2Fqemu.git

display/qxl-render: fix race condition in qxl_cursor (CVE-2021-4207)

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>
---

diff --git a/hw/display/qxl-render.c b/hw/display/qxl-render.c
index d28849b1217..237ed293baa 100644
--- a/hw/display/qxl-render.c
+++ b/hw/display/qxl-render.c
@@ -266,7 +266,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");