cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-display-cirrus-check-vga-bits-per-pixel-bpp-value.patch

4f5da8
From e0ec8bdaf64a147c83334ae6f59e279c4560d01b Mon Sep 17 00:00:00 2001
4f5da8
From: Gerd Hoffmann <kraxel@redhat.com>
4f5da8
Date: Tue, 7 Feb 2017 10:07:47 +0100
4f5da8
Subject: [PATCH 3/8] display: cirrus: check vga bits per pixel(bpp) value
4f5da8
4f5da8
RH-Author: Gerd Hoffmann <kraxel@redhat.com>
4f5da8
Message-id: <1486462072-32174-3-git-send-email-kraxel@redhat.com>
4f5da8
Patchwork-id: 73568
4f5da8
O-Subject: [RHEL-7.4 qemu-kvm PATCH 2/7] display: cirrus: check vga bits per pixel(bpp) value
4f5da8
Bugzilla: 1418232
4f5da8
RH-Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
4f5da8
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
4f5da8
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
4f5da8
4f5da8
From: Prasad J Pandit <pjp@fedoraproject.org>
4f5da8
4f5da8
In Cirrus CLGD 54xx VGA Emulator, if cirrus graphics mode is VGA,
4f5da8
'cirrus_get_bpp' returns zero(0), which could lead to a divide
4f5da8
by zero error in while copying pixel data. The same could occur
4f5da8
via blit pitch values. Add check to avoid it.
4f5da8
4f5da8
Reported-by: Huawei PSIRT <psirt@huawei.com>
4f5da8
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
4f5da8
Message-id: 1476776717-24807-1-git-send-email-ppandit@redhat.com
4f5da8
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
4f5da8
(cherry picked from commit 4299b90e9ba9ce5ca9024572804ba751aa1a7e70)
4f5da8
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
4f5da8
---
4f5da8
 hw/display/cirrus_vga.c | 14 ++++++++++----
4f5da8
 1 file changed, 10 insertions(+), 4 deletions(-)
4f5da8
4f5da8
diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c
4f5da8
index c42dfcf..dacfac6 100644
4f5da8
--- a/hw/display/cirrus_vga.c
4f5da8
+++ b/hw/display/cirrus_vga.c
4f5da8
@@ -267,6 +267,9 @@ static void cirrus_update_memory_access(CirrusVGAState *s);
4f5da8
 static bool blit_region_is_unsafe(struct CirrusVGAState *s,
4f5da8
                                   int32_t pitch, int32_t addr)
4f5da8
 {
4f5da8
+    if (!pitch) {
4f5da8
+        return true;
4f5da8
+    }
4f5da8
     if (pitch < 0) {
4f5da8
         int64_t min = addr
4f5da8
             + ((int64_t)s->cirrus_blt_height-1) * pitch;
4f5da8
@@ -710,7 +713,7 @@ static int cirrus_bitblt_videotovideo_patterncopy(CirrusVGAState * s)
4f5da8
                                             s->cirrus_addr_mask));
4f5da8
 }
4f5da8
 
4f5da8
-static void cirrus_do_copy(CirrusVGAState *s, int dst, int src, int w, int h)
4f5da8
+static int cirrus_do_copy(CirrusVGAState *s, int dst, int src, int w, int h)
4f5da8
 {
4f5da8
     int sx = 0, sy = 0;
4f5da8
     int dx = 0, dy = 0;
4f5da8
@@ -724,6 +727,9 @@ static void cirrus_do_copy(CirrusVGAState *s, int dst, int src, int w, int h)
4f5da8
         int width, height;
4f5da8
 
4f5da8
         depth = s->vga.get_bpp(&s->vga) / 8;
4f5da8
+        if (!depth) {
4f5da8
+            return 0;
4f5da8
+        }
4f5da8
         s->vga.get_resolution(&s->vga, &width, &height);
4f5da8
 
4f5da8
         /* extra x, y */
4f5da8
@@ -778,6 +784,8 @@ static void cirrus_do_copy(CirrusVGAState *s, int dst, int src, int w, int h)
4f5da8
     cirrus_invalidate_region(s, s->cirrus_blt_dstaddr,
4f5da8
 				s->cirrus_blt_dstpitch, s->cirrus_blt_width,
4f5da8
 				s->cirrus_blt_height);
4f5da8
+
4f5da8
+    return 1;
4f5da8
 }
4f5da8
 
4f5da8
 static int cirrus_bitblt_videotovideo_copy(CirrusVGAState * s)
4f5da8
@@ -785,11 +793,9 @@ static int cirrus_bitblt_videotovideo_copy(CirrusVGAState * s)
4f5da8
     if (blit_is_unsafe(s))
4f5da8
         return 0;
4f5da8
 
4f5da8
-    cirrus_do_copy(s, s->cirrus_blt_dstaddr - s->vga.start_addr,
4f5da8
+    return cirrus_do_copy(s, s->cirrus_blt_dstaddr - s->vga.start_addr,
4f5da8
             s->cirrus_blt_srcaddr - s->vga.start_addr,
4f5da8
             s->cirrus_blt_width, s->cirrus_blt_height);
4f5da8
-
4f5da8
-    return 1;
4f5da8
 }
4f5da8
 
4f5da8
 /***************************************
4f5da8
-- 
4f5da8
1.8.3.1
4f5da8