File CVE-2016-9921-qemut-display-cirrus_vga-divide-b... of Package xen

Overview Repositories Revisions Requests Users Attributes Meta

File CVE-2016-9921-qemut-display-cirrus_vga-divide-by-zero-in-cirrus_do_copy.patch of Package xen (Revision 6bbfc10fa0cd4906a4b565a5ad40b57f)

Currently displaying revision 6bbfc10fa0cd4906a4b565a5ad40b57f , Show latest

References: bsc#1015169 CVE-2016-9921 CVE-2016-9922

Subject: display: cirrus: check vga bits per pixel(bpp) value
From: Prasad J Pandit pjp@fedoraproject.org Tue Oct 18 13:15:17 2016 +0530
Date: Mon Dec 5 11:01:55 2016 +0100:
Git: 4299b90e9ba9ce5ca9024572804ba751aa1a7e70

In Cirrus CLGD 54xx VGA Emulator, if cirrus graphics mode is VGA,
'cirrus_get_bpp' returns zero(0), which could lead to a divide
by zero error in while copying pixel data. The same could occur
via blit pitch values. Add check to avoid it.

Reported-by: Huawei PSIRT <psirt@huawei.com>
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
Message-id: 1476776717-24807-1-git-send-email-ppandit@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

Index: xen-4.8.0-testing/tools/qemu-xen-traditional-dir-remote/hw/cirrus_vga.c
===================================================================
--- xen-4.8.0-testing.orig/tools/qemu-xen-traditional-dir-remote/hw/cirrus_vga.c
+++ xen-4.8.0-testing/tools/qemu-xen-traditional-dir-remote/hw/cirrus_vga.c
@@ -306,6 +306,9 @@ static void cirrus_vga_mem_writew(void *
 static bool blit_region_is_unsafe(struct CirrusVGAState *s,
                                   int32_t pitch, int32_t addr)
 {
+    if (!pitch) {
+        return true;
+    }
     if (pitch < 0) {
         int64_t min = addr
             + ((int64_t)s->cirrus_blt_height-1) * pitch;
@@ -752,7 +755,7 @@ static int cirrus_bitblt_videotovideo_pa
                                             s->cirrus_addr_mask));
 }
 
-static void cirrus_do_copy(CirrusVGAState *s, int dst, int src, int w, int h)
+static int cirrus_do_copy(CirrusVGAState *s, int dst, int src, int w, int h)
 {
     int sx = 0, sy = 0;
     int dx = 0, dy = 0;
@@ -765,6 +768,9 @@ static void cirrus_do_copy(CirrusVGAStat
         int width, height;
 
         depth = s->get_bpp((VGAState *)s) / 8;
+        if (!depth) {
+            return 0;
+        }
         s->get_resolution((VGAState *)s, &width, &height);
 
         /* extra x, y */
@@ -818,6 +824,8 @@ static void cirrus_do_copy(CirrusVGAStat
     cirrus_invalidate_region(s, s->cirrus_blt_dstaddr,
 				s->cirrus_blt_dstpitch, s->cirrus_blt_width,
 				s->cirrus_blt_height);
+
+    return 1;
 }
 
 static int cirrus_bitblt_videotovideo_copy(CirrusVGAState * s)
@@ -825,11 +833,9 @@ static int cirrus_bitblt_videotovideo_co
     if (blit_is_unsafe(s))
         return 0;
 
-    cirrus_do_copy(s, s->cirrus_blt_dstaddr - s->start_addr,
+    return cirrus_do_copy(s, s->cirrus_blt_dstaddr - s->start_addr,
             s->cirrus_blt_srcaddr - s->start_addr,
             s->cirrus_blt_width, s->cirrus_blt_height);
-
-    return 1;
 }
 
 /***************************************

Places

File CVE-2016-9921-qemut-display-cirrus_vga-divide-by-zero-in-cirrus_do_copy.patch of Package xen (Revision 6bbfc10fa0cd4906a4b565a5ad40b57f)

Places