From: Gerd Hoffmann <kraxel@redhat.com>
Date: Mon, 6 Oct 2014 09:42:34 +0000 (+0200)
Subject: vmware-vga: CVE-2014-3689: turn off hw accel
X-Git-Tag: qemu-xen-4.5.1-rc1~5
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=07fcd79289717c076b39d36ec666653422ee0646;p=qemu-upstream-4.5-testing.git

vmware-vga: CVE-2014-3689: turn off hw accel

Quick & easy stopgap for CVE-2014-3689:  We just compile out the
hardware acceleration functions which lack sanity checks.  Thankfully
we have capability bits for them (SVGA_CAP_RECT_COPY and
SVGA_CAP_RECT_FILL), so guests should deal just fine, in theory.

Subsequent patches will add the missing checks and re-enable the
hardware acceleration emulation.

Cc: qemu-stable@nongnu.org
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Don Koch <dkoch@verizon.com>
---

diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c
index 6ae3348de..b3a32a76f 100644
--- a/hw/display/vmware_vga.c
+++ b/hw/display/vmware_vga.c
@@ -29,8 +29,11 @@
 #include "hw/pci/pci.h"
 
 #undef VERBOSE
+#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
+#if 0
 #define HW_RECT_ACCEL
 #define HW_FILL_ACCEL
+#endif
 #define HW_MOUSE_ACCEL
 
 #include "vga_int.h"