From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56087) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwVIM-00013B-Az for qemu-devel@nongnu.org; Thu, 04 Dec 2014 07:14:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XwVIF-0006Jt-7t for qemu-devel@nongnu.org; Thu, 04 Dec 2014 07:14:06 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41016) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwVIF-0006Jc-1E for qemu-devel@nongnu.org; Thu, 04 Dec 2014 07:13:59 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id sB4CDvYY006949 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Thu, 4 Dec 2014 07:13:58 -0500 From: Gerd Hoffmann Date: Thu, 4 Dec 2014 13:13:40 +0100 Message-Id: <1417695221-27409-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1417695221-27409-1-git-send-email-kraxel@redhat.com> References: <1417695221-27409-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 2/2] cirrus: don't overflow CirrusVGAState->cirrus_bltbuf List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann This is CVE-2014-8106. Signed-off-by: Gerd Hoffmann --- hw/display/cirrus_vga.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c index d54fb06..2725264 100644 --- a/hw/display/cirrus_vga.c +++ b/hw/display/cirrus_vga.c @@ -293,6 +293,10 @@ static bool blit_is_unsafe(struct CirrusVGAState *s) assert(s->cirrus_blt_width > 0); assert(s->cirrus_blt_height > 0); + if (s->cirrus_blt_width > CIRRUS_BLTBUFSIZE) { + return true; + } + if (blit_region_is_unsafe(s, s->cirrus_blt_dstpitch, s->cirrus_blt_dstaddr & s->cirrus_addr_mask)) { return true; -- 1.8.3.1