From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: qemu-stable@nongnu.org, pmatouse@redhat.com,
Intel.Product.Security.Incident.Response.Team@intel.com,
Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PATCH v2 5/5] vmware-vga: use vmsvga_verify_rect in vmsvga_fill_rect
Date: Wed, 15 Oct 2014 12:10:39 +0200 [thread overview]
Message-ID: <1413367839-30999-7-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1413367839-30999-1-git-send-email-kraxel@redhat.com>
Add verification to vmsvga_fill_rect, re-enable HW_FILL_ACCEL.
Cc: qemu-stable@nongnu.org
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
hw/display/vmware_vga.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c
index 1fc9641..7f3a9e6 100644
--- a/hw/display/vmware_vga.c
+++ b/hw/display/vmware_vga.c
@@ -30,9 +30,7 @@
#undef VERBOSE
#define HW_RECT_ACCEL
-#if 0
#define HW_FILL_ACCEL
-#endif
#define HW_MOUSE_ACCEL
#include "vga_int.h"
@@ -456,6 +454,10 @@ static inline void vmsvga_fill_rect(struct vmsvga_state_s *s,
uint8_t *src;
uint8_t col[4];
+ if (!vmsvga_verify_rect(surface, __func__, x, y, w, h)) {
+ return;
+ }
+
col[0] = c;
col[1] = c >> 8;
col[2] = c >> 16;
--
1.8.3.1
next prev parent reply other threads:[~2014-10-15 10:12 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-15 10:10 [Qemu-devel] [PATCH v2 0/5] vmware-vga: fix CVE-2014-3689 Gerd Hoffmann
2014-10-15 10:10 ` [Qemu-devel] [PATCH] [sparse] fix build Gerd Hoffmann
2014-10-15 10:13 ` Gerd Hoffmann
2014-10-15 10:10 ` [Qemu-devel] [PATCH v2 1/5] vmware-vga: CVE-2014-3689: turn off hw accel Gerd Hoffmann
2014-10-16 14:25 ` Don Koch
2014-10-15 10:10 ` [Qemu-devel] [PATCH v2 2/5] vmware-vga: add vmsvga_verify_rect Gerd Hoffmann
2014-10-16 15:19 ` Don Koch
2014-10-15 10:10 ` [Qemu-devel] [PATCH v2 3/5] vmware-vga: use vmsvga_verify_rect in vmsvga_update_rect Gerd Hoffmann
2014-10-16 14:25 ` Don Koch
2014-10-15 10:10 ` [Qemu-devel] [PATCH v2 4/5] vmware-vga: use vmsvga_verify_rect in vmsvga_copy_rect Gerd Hoffmann
2014-10-16 14:29 ` Don Koch
2014-10-15 10:10 ` Gerd Hoffmann [this message]
2014-10-16 15:21 ` [Qemu-devel] [PATCH v2 5/5] vmware-vga: use vmsvga_verify_rect in vmsvga_fill_rect Don Koch
2014-10-15 15:43 ` [Qemu-devel] [PATCH v2 0/5] vmware-vga: fix CVE-2014-3689 Michael Tokarev
2014-10-16 10:54 ` Gerd Hoffmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1413367839-30999-7-git-send-email-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=Intel.Product.Security.Incident.Response.Team@intel.com \
--cc=pmatouse@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-stable@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).