From: Gerd Hoffmann <kraxel@redhat.com>
Date: Wed, 4 Mar 2015 18:02:56 +0000 (+0000)
Subject: cirrus: don't overflow CirrusVGAState->cirrus_bltbuf
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=e962bea4db167113d1bd4e640888c261763f9dd1;p=qemu-upstream-4.2-testing.git

cirrus: don't overflow CirrusVGAState->cirrus_bltbuf

This is CVE-2014-8106.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---

diff --git a/hw/cirrus_vga.c b/hw/cirrus_vga.c
index 3e2f1b252..a5e538f73 100644
--- a/hw/cirrus_vga.c
+++ b/hw/cirrus_vga.c
@@ -282,6 +282,10 @@ static bool blit_is_unsafe(struct CirrusVGAState *s)
     assert(s->cirrus_blt_width > 0);
     assert(s->cirrus_blt_height > 0);
 
+    if (s->cirrus_blt_width > CIRRUS_BLTBUFSIZE) {
+        return true;
+    }
+
     if (blit_region_is_unsafe(s, s->cirrus_blt_dstpitch,
                               s->cirrus_blt_dstaddr & s->cirrus_addr_mask)) {
         return true;