Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NMQAZ-0001V9-NC for qemu-devel@nongnu.org; Sun, 20 Dec 2009 13:06:15 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NMQAV-0001S8-2v for qemu-devel@nongnu.org; Sun, 20 Dec 2009 13:06:15 -0500 Received: from [199.232.76.173] (port=57905 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NMQAU-0001Rt-Lc for qemu-devel@nongnu.org; Sun, 20 Dec 2009 13:06:10 -0500 Received: from sj-iport-1.cisco.com ([171.71.176.70]:6251) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.60) (envelope-from ) id 1NMQAU-00077I-1W for qemu-devel@nongnu.org; Sun, 20 Dec 2009 13:06:10 -0500 From: Roland Dreier References: <4B2AB1F2.3060507@codemonkey.ws> <4B2AB549.7090209@codemonkey.ws> Date: Sun, 20 Dec 2009 10:06:06 -0800 In-Reply-To: <4B2AB549.7090209@codemonkey.ws> (Anthony Liguori's message of "Thu, 17 Dec 2009 16:48:41 -0600") Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Subject: [Qemu-devel] Re: [PATCH to consider for 0.12] vmware_vga: Don't crash on too-big DEFINE_CURSOR command List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Dave Airlie , qemu-devel@nongnu.org I see that you applied Dave's series, no worries on that, but I think we really want the following, since a clever enough malicious guest can probably turn the overrun into code execution in the host QEMU (though I've not tried writing an exploit or anything like that)... not sure if this merits the whole CVE process but it does look very much worth fixing, and probably the other guest commands want auditing too... === 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 --- hw/vmware_vga.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/hw/vmware_vga.c b/hw/vmware_vga.c index 7ab1c79..5e969ae 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 ++)