From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50027) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b7HKU-00083S-Sw for qemu-devel@nongnu.org; Mon, 30 May 2016 03:09:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b7HKQ-0001lh-L3 for qemu-devel@nongnu.org; Mon, 30 May 2016 03:09:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35555) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b7HKQ-0001lO-Fn for qemu-devel@nongnu.org; Mon, 30 May 2016 03:09:34 -0400 From: Gerd Hoffmann Date: Mon, 30 May 2016 09:09:19 +0200 Message-Id: <1464592161-18348-3-git-send-email-kraxel@redhat.com> In-Reply-To: <1464592161-18348-1-git-send-email-kraxel@redhat.com> References: <1464592161-18348-1-git-send-email-kraxel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 2/4] vmsvga: add more fifo checks List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: P J P , =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= , Gerd Hoffmann Make sure all fifo ptrs are within range. Fixes: CVE-2016-4454 Cc: P J P Reported-by: =E6=9D=8E=E5=BC=BA Signed-off-by: Gerd Hoffmann --- hw/display/vmware_vga.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c index 63a7c05..a26e62e 100644 --- a/hw/display/vmware_vga.c +++ b/hw/display/vmware_vga.c @@ -563,7 +563,10 @@ static inline int vmsvga_fifo_length(struct vmsvga_s= tate_s *s) if (CMD(min) < (uint8_t *) s->cmd->fifo - (uint8_t *) s->fifo) { return 0; } - if (CMD(max) > SVGA_FIFO_SIZE) { + if (CMD(max) > SVGA_FIFO_SIZE || + CMD(min) >=3D SVGA_FIFO_SIZE || + CMD(stop) >=3D SVGA_FIFO_SIZE || + CMD(next_cmd) >=3D SVGA_FIFO_SIZE) { return 0; } if (CMD(max) < CMD(min) + 10 * 1024) { --=20 1.8.3.1