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: v2.1.3~52 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8bf7738ff2928f50c43f543554a0d08c0b132a74;p=users%2Fdwmw2%2Fqemu.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> (cherry picked from commit 83afa38eb20ca27e30683edc7729880e091387fc) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> --- diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c index 591b645439..4a4229b92d 100644 --- a/hw/display/vmware_vga.c +++ b/hw/display/vmware_vga.c @@ -29,8 +29,10 @@ #include "hw/pci/pci.h" #undef VERBOSE +#if 0 #define HW_RECT_ACCEL #define HW_FILL_ACCEL +#endif #define HW_MOUSE_ACCEL #include "vga_int.h"