From patchwork Wed Nov 14 16:21:44 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 198957 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 5E21A2C00BE for ; Thu, 15 Nov 2012 03:31:57 +1100 (EST) Received: from localhost ([::1]:47113 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TYfhf-0000Xi-B4 for incoming@patchwork.ozlabs.org; Wed, 14 Nov 2012 11:20:39 -0500 Received: from eggs.gnu.org ([208.118.235.92]:58871) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TYfh8-0007eS-8m for qemu-devel@nongnu.org; Wed, 14 Nov 2012 11:20:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TYfh5-00074S-3S for qemu-devel@nongnu.org; Wed, 14 Nov 2012 11:20:06 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36937) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TYfh4-00070n-Rf for qemu-devel@nongnu.org; Wed, 14 Nov 2012 11:20:03 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id qAEGK0du021686 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 14 Nov 2012 11:20:00 -0500 Received: from shalem.localdomain.com (vpn1-4-130.ams2.redhat.com [10.36.4.130]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id qAEGJkIY016281; Wed, 14 Nov 2012 11:19:59 -0500 From: Hans de Goede To: Gerd Hoffmann Date: Wed, 14 Nov 2012 17:21:44 +0100 Message-Id: <1352910105-10272-10-git-send-email-hdegoede@redhat.com> In-Reply-To: <1352910105-10272-1-git-send-email-hdegoede@redhat.com> References: <1352910105-10272-1-git-send-email-hdegoede@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Hans de Goede , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 09/10] ehci: writeback_async_complete_packet: verify qh and qtd 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: Hans de Goede --- hw/usb/hcd-ehci.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index 13e9fd3..6d23af1 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -191,6 +191,7 @@ static int ehci_state_executing(EHCIQueue *q); static int ehci_state_writeback(EHCIQueue *q); static int ehci_state_advqueue(EHCIQueue *q); static int ehci_fill_queue(EHCIPacket *p); +static void ehci_free_packet(EHCIPacket *p); static const char *nr2str(const char **n, size_t len, uint32_t nr) { @@ -503,8 +504,21 @@ static bool ehci_verify_qtd(EHCIPacket *p, EHCIqtd *qtd) static void ehci_writeback_async_complete_packet(EHCIPacket *p) { EHCIQueue *q = p->queue; + EHCIqtd qtd; + EHCIqh qh; int state; + /* Verify the qh + qtd, like we do when going through fetchqh & fetchqtd */ + get_dwords(q->ehci, NLPTR_GET(q->qhaddr), + (uint32_t *) &qh, sizeof(EHCIqh) >> 2); + get_dwords(q->ehci, NLPTR_GET(q->qtdaddr), + (uint32_t *) &qtd, sizeof(EHCIqtd) >> 2); + if (!ehci_verify_qh(q, &qh) || !ehci_verify_qtd(p, &qtd)) { + p->async = EHCI_ASYNC_INITIALIZED; + ehci_free_packet(p); + return; + } + state = ehci_get_state(q->ehci, q->async); ehci_state_executing(q); ehci_state_writeback(q); /* Frees the packet! */