OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

vmware-vga: use vmsvga_verify_rect in vmsvga_copy_rect

Browse Source 
Add verification to vmsvga_copy_rect, re-enable HW_RECT_ACCEL.

Cc: qemu-stable@nongnu.org
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Don Koch <dkoch@verizon.com>
This commit is contained in:
Gerd Hoffmann 2014-10-06 11:58:51 +02:00
parent 1735fe1edb
commit 61b41b4c20
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/display/vmware_vga.c
View File

@ -29,8 +29,8 @@
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
#undef VERBOSE #undef VERBOSE
#if 0
#define HW_RECT_ACCEL #define HW_RECT_ACCEL
#if 0
#define HW_FILL_ACCEL #define HW_FILL_ACCEL
#endif #endif
#define HW_MOUSE_ACCEL #define HW_MOUSE_ACCEL
@ -406,7 +406,7 @@ static inline void vmsvga_update_rect_flush(struct vmsvga_state_s *s)
} }
#ifdef HW_RECT_ACCEL #ifdef HW_RECT_ACCEL
static inline void vmsvga_copy_rect(struct vmsvga_state_s *s, static inline int vmsvga_copy_rect(struct vmsvga_state_s *s,
int x0, int y0, int x1, int y1, int w, int h) int x0, int y0, int x1, int y1, int w, int h)
{ {
DisplaySurface *surface = qemu_console_surface(s->vga.con); DisplaySurface *surface = qemu_console_surface(s->vga.con);
@ -417,6 +417,13 @@ static inline void vmsvga_copy_rect(struct vmsvga_state_s *s,
int line = h; int line = h;
uint8_t *ptr[2]; uint8_t *ptr[2];
if (!vmsvga_verify_rect(surface, "vmsvga_copy_rect/src", x0, y0, w, h)) {
return -1;
}
if (!vmsvga_verify_rect(surface, "vmsvga_copy_rect/dst", x1, y1, w, h)) {
return -1;
}
if (y1 > y0) { if (y1 > y0) {
ptr[0] = vram + bypp * x0 + bypl * (y0 + h - 1); ptr[0] = vram + bypp * x0 + bypl * (y0 + h - 1);
ptr[1] = vram + bypp * x1 + bypl * (y1 + h - 1); ptr[1] = vram + bypp * x1 + bypl * (y1 + h - 1);
@ -432,6 +439,7 @@ static inline void vmsvga_copy_rect(struct vmsvga_state_s *s,
} }
vmsvga_update_rect_delayed(s, x1, y1, w, h); vmsvga_update_rect_delayed(s, x1, y1, w, h);
return 0;
} }
#endif #endif
@ -625,12 +633,12 @@ static void vmsvga_fifo_run(struct vmsvga_state_s *s)
width = vmsvga_fifo_read(s); width = vmsvga_fifo_read(s);
height = vmsvga_fifo_read(s); height = vmsvga_fifo_read(s);
#ifdef HW_RECT_ACCEL #ifdef HW_RECT_ACCEL
vmsvga_copy_rect(s, x, y, dx, dy, width, height); if (vmsvga_copy_rect(s, x, y, dx, dy, width, height) == 0) {
break; break;
#else }
#endif
args = 0; args = 0;
goto badcmd; goto badcmd;
#endif
case SVGA_CMD_DEFINE_CURSOR: case SVGA_CMD_DEFINE_CURSOR:
len -= 8; len -= 8;