thebeanogamer / rpms / qemu-kvm

Forked from rpms/qemu-kvm 5 months ago
Clone
baf1ce
From bd9de3a28ae6721d5ccf1d14acf259b3e6f4093c Mon Sep 17 00:00:00 2001
baf1ce
From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@redhat.com>
baf1ce
Date: Wed, 19 Jun 2019 16:03:38 +0200
baf1ce
Subject: [PATCH 1/2] qxl: check release info object
baf1ce
MIME-Version: 1.0
baf1ce
Content-Type: text/plain; charset=UTF-8
baf1ce
Content-Transfer-Encoding: 8bit
baf1ce
baf1ce
RH-Author: Philippe Mathieu-Daudé <philmd@redhat.com>
baf1ce
Message-id: <20190619160338.15430-2-philmd@redhat.com>
baf1ce
Patchwork-id: 88733
baf1ce
O-Subject: [RHEL-7.7 qemu-kvm PATCH 1/1] qxl: check release info object
baf1ce
Bugzilla: 1732337
baf1ce
RH-Acked-by: Christophe de Dinechin <cdupontd@redhat.com>
baf1ce
RH-Acked-by: Gerd Hoffmann <kraxel@redhat.com>
baf1ce
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
baf1ce
baf1ce
From: Prasad J Pandit <pjp@fedoraproject.org>
baf1ce
baf1ce
When releasing spice resources in release_resource() routine,
baf1ce
if release info object 'ext.info' is null, it leads to null
baf1ce
pointer dereference. Add check to avoid it.
baf1ce
baf1ce
Reported-by: Bugs SysSec <bugs-syssec@rub.de>
baf1ce
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
baf1ce
Message-id: 20190425063534.32747-1-ppandit@redhat.com
baf1ce
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
baf1ce
(cherry picked from commit d52680fc932efb8a2f334cc6993e705ed1e31e99)
baf1ce
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
baf1ce
---
baf1ce
 hw/display/qxl.c | 3 +++
baf1ce
 1 file changed, 3 insertions(+)
baf1ce
baf1ce
diff --git a/hw/display/qxl.c b/hw/display/qxl.c
baf1ce
index 0625a76..d493101 100644
baf1ce
--- a/hw/display/qxl.c
baf1ce
+++ b/hw/display/qxl.c
baf1ce
@@ -735,6 +735,9 @@ static void interface_release_resource(QXLInstance *sin,
baf1ce
     QXLReleaseRing *ring;
baf1ce
     uint64_t *item, id;
baf1ce
 
baf1ce
+    if (!ext.info) {
baf1ce
+        return;
baf1ce
+    }
baf1ce
     if (ext.group_id == MEMSLOT_GROUP_HOST) {
baf1ce
         /* host group -> vga mode update request */
baf1ce
         qemu_spice_destroy_update(&qxl->ssd, (void *)(intptr_t)ext.info->id);
baf1ce
-- 
baf1ce
1.8.3.1
baf1ce