From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43757) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V52qy-00064g-2l for qemu-devel@nongnu.org; Thu, 01 Aug 2013 20:04:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V52qs-0003kb-Tt for qemu-devel@nongnu.org; Thu, 01 Aug 2013 20:04:19 -0400 From: Gerd Hoffmann Date: Thu, 1 Aug 2013 15:11:08 +0200 Message-Id: <1375362669-14815-2-git-send-email-kraxel@redhat.com> In-Reply-To: <1375362669-14815-1-git-send-email-kraxel@redhat.com> References: <1375362669-14815-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 1/2] xhci: fix segfault List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , qemu-stable@nongnu.org Guest trying to reset a endpoint of a disconnected device resulted in xhci trying to dereference uport while being NULL, thereby crashing qemu. Fix that by adding a check. Drop unused dev variable while touching that code bit. Cc: qemu-stable@nongnu.org Signed-off-by: Gerd Hoffmann --- hw/usb/hcd-xhci.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index 7cbf813..ff5f681 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -1429,7 +1429,6 @@ static TRBCCode xhci_reset_ep(XHCIState *xhci, unsigned int slotid, { XHCISlot *slot; XHCIEPContext *epctx; - USBDevice *dev; trace_usb_xhci_ep_reset(slotid, epid); assert(slotid >= 1 && slotid <= xhci->numslots); @@ -1465,8 +1464,8 @@ static TRBCCode xhci_reset_ep(XHCIState *xhci, unsigned int slotid, ep |= 0x80; } - dev = xhci->slots[slotid-1].uport->dev; - if (!dev) { + if (!xhci->slots[slotid-1].uport || + !xhci->slots[slotid-1].uport->dev) { return CC_USB_TRANSACTION_ERROR; } -- 1.7.9.7