From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52673) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XdwnU-0002nC-D6 for qemu-devel@nongnu.org; Tue, 14 Oct 2014 03:45:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XdwnO-0007MP-Px for qemu-devel@nongnu.org; Tue, 14 Oct 2014 03:45:32 -0400 From: Gerd Hoffmann Date: Tue, 14 Oct 2014 09:45:08 +0200 Message-Id: <1413272710-10458-4-git-send-email-kraxel@redhat.com> In-Reply-To: <1413272710-10458-1-git-send-email-kraxel@redhat.com> References: <1413272710-10458-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 3/5] vmware-vga: use vmsvga_verify_rect in vmsvga_update_rect List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org, pmatouse@redhat.com, Intel.Product.Security.Incident.Response.Team@intel.com, Gerd Hoffmann Switch vmsvga_update_rect over to use vmsvga_verify_rect. Slight change in behavior: We don't try to automatically fixup rectangles any more. Invalid update requests will be ignored instead. Cc: qemu-stable@nongnu.org Signed-off-by: Gerd Hoffmann --- hw/display/vmware_vga.c | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c index fc0a2a7..7564f88 100644 --- a/hw/display/vmware_vga.c +++ b/hw/display/vmware_vga.c @@ -356,36 +356,8 @@ static inline void vmsvga_update_rect(struct vmsvga_state_s *s, uint8_t *src; uint8_t *dst; - if (x < 0) { - fprintf(stderr, "%s: update x was < 0 (%d)\n", __func__, x); - w += x; - x = 0; - } - if (w < 0) { - fprintf(stderr, "%s: update w was < 0 (%d)\n", __func__, w); - w = 0; - } - if (x + w > surface_width(surface)) { - fprintf(stderr, "%s: update width too large x: %d, w: %d\n", - __func__, x, w); - x = MIN(x, surface_width(surface)); - w = surface_width(surface) - x; - } - - if (y < 0) { - fprintf(stderr, "%s: update y was < 0 (%d)\n", __func__, y); - h += y; - y = 0; - } - if (h < 0) { - fprintf(stderr, "%s: update h was < 0 (%d)\n", __func__, h); - h = 0; - } - if (y + h > surface_height(surface)) { - fprintf(stderr, "%s: update height too large y: %d, h: %d\n", - __func__, y, h); - y = MIN(y, surface_height(surface)); - h = surface_height(surface) - y; + if (!vmsvga_verify_rect(surface, __func__, x, y, w, h)) { + return; } bypl = surface_stride(surface); -- 1.8.3.1