From: Roland Dreier Date: Wed, 6 Jan 2010 04:43:34 +0000 (-0800) Subject: vmware_vga: Check cursor dimensions passed from guest to avoid buffer overflow X-Git-Tag: v0.12.2~17 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e1daf40e3e61537da1509236dadc23ca8c4bc0e6;p=thirdparty%2Fqemu.git vmware_vga: Check cursor dimensions passed from guest to avoid buffer overflow Check that the cursor dimensions passed from the guest for the DEFINE_CURSOR command don't overflow the available space in the cursor.image[] or cursor.mask[] arrays before copying data from the guest into those arrays. Signed-off-by: Roland Dreier Signed-off-by: Anthony Liguori (cherry picked from commit f2d928d44ebc918750c94f3605c1417f1f653ec9) --- diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c index 7ab1c7910b2..5e969aedb47 100644 --- a/hw/vmware_vga.c +++ b/hw/vmware_vga.c @@ -562,6 +562,13 @@ static void vmsvga_fifo_run(struct vmsvga_state_s *s) cursor.height = y = vmsvga_fifo_read(s); vmsvga_fifo_read(s); cursor.bpp = vmsvga_fifo_read(s); + + if (SVGA_BITMAP_SIZE(x, y) > sizeof cursor.mask || + SVGA_PIXMAP_SIZE(x, y, cursor.bpp) > sizeof cursor.image) { + args = SVGA_BITMAP_SIZE(x, y) + SVGA_PIXMAP_SIZE(x, y, cursor.bpp); + goto badcmd; + } + for (args = 0; args < SVGA_BITMAP_SIZE(x, y); args ++) cursor.mask[args] = vmsvga_fifo_read_raw(s); for (args = 0; args < SVGA_PIXMAP_SIZE(x, y, cursor.bpp); args ++)