cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-display-qxl-render-fix-race-condition-in-qxl_cursor-.patch

432cb7
From abd84f26e0fe0bc9952d91fbd35fb3a7253cfecf Mon Sep 17 00:00:00 2001
432cb7
From: Jon Maloy <jmaloy@rehat.com>
432cb7
Date: Wed, 13 Apr 2022 20:54:45 -0400
432cb7
Subject: [PATCH 1/2] display/qxl-render: fix race condition in qxl_cursor
432cb7
 (CVE-2021-4207)
432cb7
MIME-Version: 1.0
432cb7
Content-Type: text/plain; charset=UTF-8
432cb7
Content-Transfer-Encoding: 8bit
432cb7
432cb7
RH-Author: Jon Maloy <jmaloy@redhat.com>
432cb7
RH-MergeRequest: 152: display/qxl-render: fix race condition in qxl_cursor (CVE-2021-4207)
432cb7
RH-Commit: [1/1] f05b9a956f2e0ca522b5be127beff813d04b5588 (jmaloy/qemu-kvm)
432cb7
RH-Bugzilla: 2040738
432cb7
RH-Acked-by: Gerd Hoffmann <kraxel@redhat.com>
432cb7
RH-Acked-by: Mauro Matteo Cascella <None>
432cb7
432cb7
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2040738
432cb7
Upstream: Merged
432cb7
CVE: CVE-2021-4207
432cb7
432cb7
commit 9569f5cb5b4bffa9d3ebc8ba7da1e03830a9a895
432cb7
Author: Mauro Matteo Cascella <mcascell@redhat.com>
432cb7
Date:   Thu Apr 7 10:11:06 2022 +0200
432cb7
432cb7
    display/qxl-render: fix race condition in qxl_cursor (CVE-2021-4207)
432cb7
432cb7
    Avoid fetching 'width' and 'height' a second time to prevent possible
432cb7
    race condition. Refer to security advisory
432cb7
    https://starlabs.sg/advisories/22-4207/ for more information.
432cb7
432cb7
    Fixes: CVE-2021-4207
432cb7
    Signed-off-by: Mauro Matteo Cascella <mcascell@redhat.com>
432cb7
    Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
432cb7
    Message-Id: <20220407081106.343235-1-mcascell@redhat.com>
432cb7
    Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
432cb7
432cb7
(cherry picked from commit 9569f5cb5b4bffa9d3ebc8ba7da1e03830a9a895)
432cb7
Signed-off-by: Jon Maloy <jmaloy@redhat.com>
432cb7
---
432cb7
 hw/display/qxl-render.c | 2 +-
432cb7
 1 file changed, 1 insertion(+), 1 deletion(-)
432cb7
432cb7
diff --git a/hw/display/qxl-render.c b/hw/display/qxl-render.c
432cb7
index d28849b121..237ed293ba 100644
432cb7
--- a/hw/display/qxl-render.c
432cb7
+++ b/hw/display/qxl-render.c
432cb7
@@ -266,7 +266,7 @@ static QEMUCursor *qxl_cursor(PCIQXLDevice *qxl, QXLCursor *cursor,
432cb7
         }
432cb7
         break;
432cb7
     case SPICE_CURSOR_TYPE_ALPHA:
432cb7
-        size = sizeof(uint32_t) * cursor->header.width * cursor->header.height;
432cb7
+        size = sizeof(uint32_t) * c->width * c->height;
432cb7
         qxl_unpack_chunks(c->data, size, qxl, &cursor->chunk, group_id);
432cb7
         if (qxl->debug > 2) {
432cb7
             cursor_print_ascii_art(c, "qxl/alpha");
432cb7
-- 
432cb7
2.27.0
432cb7