]> xenbits.xensource.com Git - qemu-upstream-4.3-testing.git/commitdiff
cirrus: don't overflow CirrusVGAState->cirrus_bltbuf
authorGerd Hoffmann <kraxel@redhat.com>
Wed, 4 Mar 2015 18:02:44 +0000 (18:02 +0000)
committerStefano Stabellini <stefano.stabellini@eu.citrix.com>
Thu, 5 Mar 2015 13:21:57 +0000 (13:21 +0000)
This is CVE-2014-8106.

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

index 816c7941b6908763ac05ccd4ee6f3c0cd8405913..3695f6c3e6121d156e4ca7cbe2b4023109d6f709 100644 (file)
@@ -286,6 +286,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;