From: Gerd Hoffmann <kraxel@redhat.com>
Date: Wed, 4 Mar 2015 17:55:51 +0000 (+0000)
Subject: vmware-vga: CVE-2014-3689: turn off hw accel
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=0cfe152644456afec593a3e3dc0363dd10d39067;p=qemu-upstream-4.2-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>
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
---

diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c
index af70bdee0..757749f5e 100644
--- a/hw/vmware_vga.c
+++ b/hw/vmware_vga.c
@@ -28,8 +28,11 @@
 #include "vmware_vga.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"