From patchwork Tue Apr 17 08:45:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 153087 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 379E3B7022 for ; Tue, 17 Apr 2012 19:11:15 +1000 (EST) Received: from localhost ([::1]:51694 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SK4RM-0002lN-IW for incoming@patchwork.ozlabs.org; Tue, 17 Apr 2012 05:11:12 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37810) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SK4R2-0002dl-P8 for qemu-devel@nongnu.org; Tue, 17 Apr 2012 05:10:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SK4Qr-0006Ja-SA for qemu-devel@nongnu.org; Tue, 17 Apr 2012 05:10:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:10461) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SK4Qr-0006Iy-JA for qemu-devel@nongnu.org; Tue, 17 Apr 2012 05:10:41 -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 q3H9AdNX012561 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 17 Apr 2012 05:10:40 -0400 Received: from rincewind.home.kraxel.org (ovpn-116-48.ams2.redhat.com [10.36.116.48]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id q3H8jS3K010404; Tue, 17 Apr 2012 04:45:29 -0400 Received: by rincewind.home.kraxel.org (Postfix, from userid 500) id C8AF740985; Tue, 17 Apr 2012 10:45:27 +0200 (CEST) From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Tue, 17 Apr 2012 10:45:14 +0200 Message-Id: <1334652326-27874-10-git-send-email-kraxel@redhat.com> In-Reply-To: <1334652326-27874-1-git-send-email-kraxel@redhat.com> References: <1334652326-27874-1-git-send-email-kraxel@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Gerd Hoffmann Subject: [Qemu-devel] [PATCH 09/21] usb_packet_set_state: handle p->ep == NULL 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 usb_packet_set_state can be called with p->ep = NULL. The tracepoint there tries to log endpoint information, which leads to a segfault. This patch makes usb_packet_set_state handle the NULL pointer properly. Signed-off-by: Gerd Hoffmann --- hw/usb/core.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/hw/usb/core.c b/hw/usb/core.c index a4048fe..9a14a53 100644 --- a/hw/usb/core.c +++ b/hw/usb/core.c @@ -484,12 +484,17 @@ void usb_packet_check_state(USBPacket *p, USBPacketState expected) void usb_packet_set_state(USBPacket *p, USBPacketState state) { - USBDevice *dev = p->ep->dev; - USBBus *bus = usb_bus_from_device(dev); - - trace_usb_packet_state_change(bus->busnr, dev->port->path, p->ep->nr, p, - usb_packet_state_name(p->state), - usb_packet_state_name(state)); + if (p->ep) { + USBDevice *dev = p->ep->dev; + USBBus *bus = usb_bus_from_device(dev); + trace_usb_packet_state_change(bus->busnr, dev->port->path, p->ep->nr, p, + usb_packet_state_name(p->state), + usb_packet_state_name(state)); + } else { + trace_usb_packet_state_change(-1, "", -1, p, + usb_packet_state_name(p->state), + usb_packet_state_name(state)); + } p->state = state; }