]> xenbits.xensource.com Git - qemu-upstream-4.2-testing.git/commitdiff
vmware-vga: CVE-2014-3689: turn off hw accel
authorGerd Hoffmann <kraxel@redhat.com>
Wed, 4 Mar 2015 17:55:51 +0000 (17:55 +0000)
committerStefano Stabellini <stefano.stabellini@eu.citrix.com>
Thu, 5 Mar 2015 13:22:12 +0000 (13:22 +0000)
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>
hw/vmware_vga.c

index af70bdee094a0035f4e6797b1e5583bff38e506f..757749f5ef6f7335a7b19ceafa8d99c79a51bc4c 100644 (file)
 #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"