From patchwork Tue Nov 20 09:19:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alon Levy X-Patchwork-Id: 200271 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 606AE2C008F for ; Tue, 20 Nov 2012 20:19:31 +1100 (EST) Received: from localhost ([::1]:32826 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TajzN-0001WW-EW for incoming@patchwork.ozlabs.org; Tue, 20 Nov 2012 04:19:29 -0500 Received: from eggs.gnu.org ([208.118.235.92]:34582) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tajz7-0001Ni-3a for qemu-devel@nongnu.org; Tue, 20 Nov 2012 04:19:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tajz0-0004HS-Qw for qemu-devel@nongnu.org; Tue, 20 Nov 2012 04:19:13 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60684) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tajz0-0004GM-Iv for qemu-devel@nongnu.org; Tue, 20 Nov 2012 04:19:06 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qAK9J3m6002392 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 20 Nov 2012 04:19:05 -0500 Received: from garlic.redhat.com (vpn-11-35.rdu.redhat.com [10.11.11.35]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id qAK9J1tX006362; Tue, 20 Nov 2012 04:19:02 -0500 From: Alon Levy To: qemu-devel@nongnu.org Date: Tue, 20 Nov 2012 11:19:00 +0200 Message-Id: <1353403141-32070-1-git-send-email-alevy@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kraxel@redhat.com Subject: [Qemu-devel] [PATCH 1/2] hw/qxl: extract verify_surface_cmd from qxl_track_command 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 --- hw/qxl.c | 48 +++++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/hw/qxl.c b/hw/qxl.c index 1482389..af5f68e 100644 --- a/hw/qxl.c +++ b/hw/qxl.c @@ -430,6 +430,34 @@ static void qxl_ring_set_dirty(PCIQXLDevice *qxl) qxl_set_dirty(&qxl->vga.vram, addr, end); } +static int verify_surface_cmd(PCIQXLDevice *qxl, QXLSurfaceCmd *cmd) +{ + uint32_t id = le32_to_cpu(cmd->surface_id); + + if (id >= qxl->ssd.num_surfaces) { + qxl_set_guest_bug(qxl, "QXL_CMD_SURFACE id %d >= %d", id, + qxl->ssd.num_surfaces); + return 1; + } + if (cmd->type == QXL_SURFACE_CMD_CREATE && + (cmd->u.surface_create.stride & 0x03) != 0) { + qxl_set_guest_bug(qxl, "QXL_CMD_SURFACE stride = %d %% 4 != 0\n", + cmd->u.surface_create.stride); + return 1; + } + if (cmd->type == QXL_SURFACE_CMD_CREATE) { + intptr_t surface_offset = (intptr_t)qxl_phys2virt(qxl, + cmd->u.surface_create.data, + MEMSLOT_GROUP_GUEST); + if (!surface_offset) { + qxl_set_guest_bug(qxl, "QXL_CMD_SURFACE invalid data: %ld\n", + cmd->u.surface_create.data); + return 1; + } + } + return 0; +} + /* * keep track of some command state, for savevm/loadvm. * called from spice server thread context only @@ -446,27 +474,9 @@ static int qxl_track_command(PCIQXLDevice *qxl, struct QXLCommandExt *ext) } uint32_t id = le32_to_cpu(cmd->surface_id); - if (id >= qxl->ssd.num_surfaces) { - qxl_set_guest_bug(qxl, "QXL_CMD_SURFACE id %d >= %d", id, - qxl->ssd.num_surfaces); + if (!verify_surface_cmd(qxl, cmd)) { return 1; } - if (cmd->type == QXL_SURFACE_CMD_CREATE && - (cmd->u.surface_create.stride & 0x03) != 0) { - qxl_set_guest_bug(qxl, "QXL_CMD_SURFACE stride = %d %% 4 != 0\n", - cmd->u.surface_create.stride); - return 1; - } - if (cmd->type == QXL_SURFACE_CMD_CREATE) { - intptr_t surface_offset = (intptr_t)qxl_phys2virt(qxl, - cmd->u.surface_create.data, - MEMSLOT_GROUP_GUEST); - if (!surface_offset) { - qxl_set_guest_bug(qxl, "QXL_CMD_SURFACE invalid data: %ld\n", - cmd->u.surface_create.data); - return 1; - } - } qemu_mutex_lock(&qxl->track_lock); if (cmd->type == QXL_SURFACE_CMD_CREATE) { qxl->guest_surfaces.cmds[id] = ext->cmd.data;