From patchwork Mon Aug 20 09:32:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alon Levy X-Patchwork-Id: 178721 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 610612C0334 for ; Mon, 20 Aug 2012 19:33:38 +1000 (EST) Received: from localhost ([::1]:48094 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T3OMa-0006gp-4A for incoming@patchwork.ozlabs.org; Mon, 20 Aug 2012 05:33:36 -0400 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 Received: from garlic.tlv.redhat.com (spice-ovirt.tlv.redhat.com [10.35.4.71]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q7K9XLk6016459; Mon, 20 Aug 2012 05:33:22 -0400 From: Alon Levy To: qemu-devel@nongnu.org, kraxel@redhat.com Date: Mon, 20 Aug 2012 12:32:35 +0300 Message-Id: <1345455158-15617-1-git-send-email-alevy@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v8 1/4] qxl/update_area_io: guest_bug on invalid parameters X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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);