From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:50399) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T3OMO-0006g8-NC for qemu-devel@nongnu.org; Mon, 20 Aug 2012 05:33:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T3OMN-0007d3-S2 for qemu-devel@nongnu.org; Mon, 20 Aug 2012 05:33:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:18747) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T3OMN-0007cs-Kj for qemu-devel@nongnu.org; Mon, 20 Aug 2012 05:33:23 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q7K9XM5n011341 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 20 Aug 2012 05:33:22 -0400 From: Alon Levy Date: Mon, 20 Aug 2012 12:32:35 +0300 Message-Id: <1345455158-15617-1-git-send-email-alevy@redhat.com> Subject: [Qemu-devel] [PATCH v8 1/4] qxl/update_area_io: guest_bug on invalid parameters List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, kraxel@redhat.com Signed-off-by: Alon Levy --- Changes for patchset v7->v8: QXL_IO_MONITORS_CONFIG_ASYNC is defined even when spice-protocol < 0.12 (Gerd Hoffman) QXL_HAS_.. is either defined or not, same as other feature definitions (Blue Swirl) Only the third patch "qxl: add QXL_IO_MONITORS_CONFIG_ASYNC" is affected. hw/qxl.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/hw/qxl.c b/hw/qxl.c index c2dd3b4..6c48eb9 100644 --- a/hw/qxl.c +++ b/hw/qxl.c @@ -1385,6 +1385,18 @@ async_common: QXLCookie *cookie = NULL; QXLRect update = d->ram->update_area; + if (d->ram->update_surface > NUM_SURFACES) { + qxl_set_guest_bug(d, "QXL_IO_UPDATE_AREA: invalid surface id %d\n", + d->ram->update_surface); + return; + } + if (update.left >= update.right || update.top >= update.bottom) { + qxl_set_guest_bug(d, + "QXL_IO_UPDATE_AREA: invalid area (%ux%u)x(%ux%u)\n", + update.left, update.top, update.right, update.bottom); + return; + } + if (async == QXL_ASYNC) { cookie = qxl_cookie_new(QXL_COOKIE_TYPE_IO, QXL_IO_UPDATE_AREA_ASYNC); -- 1.7.11.2