From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39162) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bhyiU-0003W0-QK for qemu-devel@nongnu.org; Thu, 08 Sep 2016 08:46:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bhyiQ-0004Yp-3m for qemu-devel@nongnu.org; Thu, 08 Sep 2016 08:46:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41680) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bhyiP-0004Yd-Tx for qemu-devel@nongnu.org; Thu, 08 Sep 2016 08:46:02 -0400 From: P J P Date: Thu, 8 Sep 2016 18:15:54 +0530 Message-Id: <1473338754-15430-1-git-send-email-ppandit@redhat.com> Subject: [Qemu-devel] [PATCH] vmsvga: correct bitmap and pixmap size checks List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Qemu Developers Cc: Gerd Hoffmann , Qinghao Tang , Li Qiang , Prasad J Pandit From: Prasad J Pandit When processing svga command DEFINE_CURSOR in vmsvga_fifo_run, the computed BITMAP and PIXMAP size are checked against the 'cursor.mask[]' and 'cursor.image[]' array sizes in bytes. Correct these checks to avoid OOB memory access. Reported-by: Qinghao Tang Reported-by: Li Qiang Signed-off-by: Prasad J Pandit --- hw/display/vmware_vga.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c index e51a05e..6599cf0 100644 --- a/hw/display/vmware_vga.c +++ b/hw/display/vmware_vga.c @@ -676,11 +676,13 @@ static void vmsvga_fifo_run(struct vmsvga_state_s *s) cursor.bpp = vmsvga_fifo_read(s); args = SVGA_BITMAP_SIZE(x, y) + SVGA_PIXMAP_SIZE(x, y, cursor.bpp); - if (cursor.width > 256 || - cursor.height > 256 || - cursor.bpp > 32 || - SVGA_BITMAP_SIZE(x, y) > sizeof cursor.mask || - SVGA_PIXMAP_SIZE(x, y, cursor.bpp) > sizeof cursor.image) { + if (cursor.width > 256 + || cursor.height > 256 + || cursor.bpp > 32 + || SVGA_BITMAP_SIZE(x, y) + > sizeof(cursor.mask) / sizeof(cursor.mask[0]) + || SVGA_PIXMAP_SIZE(x, y, cursor.bpp) + > sizeof(cursor.image) / sizeof(cursor.image[0])) { goto badcmd; } -- 2.5.5