From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37705) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8jdB-0007Vq-AR for qemu-devel@nongnu.org; Fri, 03 Jun 2016 03:34:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b8jd3-00004w-N9 for qemu-devel@nongnu.org; Fri, 03 Jun 2016 03:34:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53353) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b8jd3-0008WO-IM for qemu-devel@nongnu.org; Fri, 03 Jun 2016 03:34:49 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1844B80096 for ; Fri, 3 Jun 2016 07:34:49 +0000 (UTC) From: Gerd Hoffmann Date: Fri, 3 Jun 2016 09:34:42 +0200 Message-Id: <1464939283-32184-6-git-send-email-kraxel@redhat.com> In-Reply-To: <1464939283-32184-1-git-send-email-kraxel@redhat.com> References: <1464939283-32184-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] [PULL 5/6] vmsvga: don't process more than 1024 fifo commands at once List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , P J P vmsvga_fifo_run is called in regular intervals (on each display update) and will resume where it left off. So we can simply exit the loop, without having to worry about how processing will continue. Fixes: CVE-2016-4453 Cc: P J P Reported-by: =E6=9D=8E=E5=BC=BA Signed-off-by: Gerd Hoffmann Message-id: 1464592161-18348-5-git-send-email-kraxel@redhat.com --- hw/display/vmware_vga.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c index de2567b..e51a05e 100644 --- a/hw/display/vmware_vga.c +++ b/hw/display/vmware_vga.c @@ -597,13 +597,13 @@ static inline uint32_t vmsvga_fifo_read(struct vmsv= ga_state_s *s) static void vmsvga_fifo_run(struct vmsvga_state_s *s) { uint32_t cmd, colour; - int args, len; + int args, len, maxloop =3D 1024; int x, y, dx, dy, width, height; struct vmsvga_cursor_definition_s cursor; uint32_t cmd_start; =20 len =3D vmsvga_fifo_length(s); - while (len > 0) { + while (len > 0 && --maxloop > 0) { /* May need to go back to the start of the command if incomplete= */ cmd_start =3D s->fifo_stop; =20 --=20 1.8.3.1