From patchwork Wed Nov 14 16:21:36 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: 198956 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 15C4E2C00A7 for ; Thu, 15 Nov 2012 03:28:28 +1100 (EST) Received: from localhost ([::1]:47103 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TYfhb-0000XZ-ST for incoming@patchwork.ozlabs.org; Wed, 14 Nov 2012 11:20:35 -0500 Received: from eggs.gnu.org ([208.118.235.92]:58781) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TYfgv-0007BP-F2 for qemu-devel@nongnu.org; Wed, 14 Nov 2012 11:19:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TYfgs-0006w3-Ce for qemu-devel@nongnu.org; Wed, 14 Nov 2012 11:19:53 -0500 Received: from mx1.redhat.com ([209.132.183.28]:32408) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TYfgs-0006vn-4x for qemu-devel@nongnu.org; Wed, 14 Nov 2012 11:19:50 -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 qAEGJneO024937 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 14 Nov 2012 11:19:49 -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 qAEGJkIQ016281; Wed, 14 Nov 2012 11:19:48 -0500 From: Hans de Goede To: Gerd Hoffmann Date: Wed, 14 Nov 2012 17:21:36 +0100 Message-Id: <1352910105-10272-2-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 01/10] ehci: Don't access packet after freeing it 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 ehci_state_writeback() will free the packet, so we should not access the packet after calling ehci_state_writeback(). Signed-off-by: Hans de Goede --- hw/usb/hcd-ehci.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index ee6c9ae..a8b1a40 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -453,12 +453,13 @@ static EHCIPacket *ehci_alloc_packet(EHCIQueue *q) static void ehci_free_packet(EHCIPacket *p) { if (p->async == EHCI_ASYNC_FINISHED) { - int state = ehci_get_state(p->queue->ehci, p->queue->async); + EHCIQueue *q = p->queue; + int state = ehci_get_state(q->ehci, q->async); /* This is a normal, but rare condition (cancel racing completion) */ fprintf(stderr, "EHCI: Warning packet completed but not processed\n"); - ehci_state_executing(p->queue); - ehci_state_writeback(p->queue); - ehci_set_state(p->queue->ehci, p->queue->async, state); + ehci_state_executing(q); + ehci_state_writeback(q); + ehci_set_state(q->ehci, q->async, state); /* state_writeback recurses into us with async == EHCI_ASYNC_NONE!! */ return; }