From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:51515) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SPrnR-0007lg-UK for qemu-devel@nongnu.org; Thu, 03 May 2012 04:54:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SPrnK-0005Ct-K3 for qemu-devel@nongnu.org; Thu, 03 May 2012 04:53:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60401) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SPrnK-00059z-C5 for qemu-devel@nongnu.org; Thu, 03 May 2012 04:53:50 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q438rma7016741 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 3 May 2012 04:53:48 -0400 From: Gerd Hoffmann Date: Thu, 3 May 2012 10:53:39 +0200 Message-Id: <1336035226-9174-6-git-send-email-kraxel@redhat.com> In-Reply-To: <1336035226-9174-1-git-send-email-kraxel@redhat.com> References: <1336035226-9174-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 05/12] qxl: replace panic with guest bug in qxl_track_command List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alon Levy , Gerd Hoffmann From: Alon Levy Signed-off-by: Alon Levy Signed-off-by: Gerd Hoffmann --- hw/qxl.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/hw/qxl.c b/hw/qxl.c index b6a738e..8b66cbb 100644 --- a/hw/qxl.c +++ b/hw/qxl.c @@ -394,7 +394,11 @@ static int qxl_track_command(PCIQXLDevice *qxl, struct QXLCommandExt *ext) return 1; } uint32_t id = le32_to_cpu(cmd->surface_id); - PANIC_ON(id >= NUM_SURFACES); + + if (id >= NUM_SURFACES) { + qxl_guest_bug(qxl, "QXL_CMD_SURFACE id %d >= %d", id, NUM_SURFACES); + return 1; + } qemu_mutex_lock(&qxl->track_lock); if (cmd->type == QXL_SURFACE_CMD_CREATE) { qxl->guest_surfaces.cmds[id] = ext->cmd.data; -- 1.7.1