1 files changed, 41 insertions, 0 deletions

diff --git a/meta/recipes-devtools/qemu/qemu/vmware-vga-CVE-2014-3689.patch b/meta/recipes-devtools/qemu/qemu/vmware-vga-CVE-2014-3689.patch
new file mode 100644
index 0000000000..74cf8465ce
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/vmware-vga-CVE-2014-3689.patch
@@ -0,0 +1,41 @@
+From 56b6131a153668bbb77e1b9b7e86379c41f8fdf9 Mon Sep 17 00:00:00 2001
+From: Gerd Hoffmann <kraxel@redhat.com>
+Date: Mon, 6 Oct 2014 11:42:34 +0200
+Subject: [PATCH] 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.
+
+Upstream-Status: Backport
+
+Cc: qemu-stable@nongnu.org
+Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
+Reviewed-by: Don Koch <dkoch@verizon.com>
+Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
+---
+ hw/display/vmware_vga.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c
+index a6a8cdc..113ce1f 100644
+--- a/hw/display/vmware_vga.c
++++ b/hw/display/vmware_vga.c
+@@ -27,8 +27,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"
+-- 
+1.9.1
+