From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756205AbbE2NR3 (ORCPT ); Fri, 29 May 2015 09:17:29 -0400 Received: from mga09.intel.com ([134.134.136.24]:1150 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753035AbbE2NRT (ORCPT ); Fri, 29 May 2015 09:17:19 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.13,517,1427785200"; d="scan'208";a="499894817" Message-ID: <5568677D.7070200@linux.intel.com> Date: Fri, 29 May 2015 16:19:57 +0300 From: Mathias Nyman User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.6.0 MIME-Version: 1.0 To: Roger Quadros , mathias.nyman@intel.com CC: gregkh@linuxfoundation.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Kishon Vijay Abraham I Subject: Re: [PATCH] usb: host: xhci-pci: Fix NULL pointer dereference error References: <1427977409-7671-1-git-send-email-rogerq@ti.com> <1427977409-7671-6-git-send-email-rogerq@ti.com> <55647FE8.7020507@ti.com> In-Reply-To: <55647FE8.7020507@ti.com> X-Enigmail-Version: 1.6 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 26.05.2015 17:15, Roger Quadros wrote: > From: Kishon Vijay Abraham I > > commit 3b8295d5cbf2 (usb: xhci: Fix suspend/resume when used > with OTG core) removes assigning xhci->main_hcd from xhci_gen_setup > and adds it in the probe of xhci-plat and xhci-pci. > > In the case of xhci-pci, xhci_mem_init is invoked before main_hcd is > initialized in the probe causing a null pointer deferencing error > when a PCIe usb controller card is plugged in. > > Fix it by initializing xhci->main_hcd in xhci_gen_setup and removing > it from xhci_pci_probe(). > > Signed-off-by: Kishon Vijay Abraham I > Acked-by: Roger Quadros > --- > > drivers/usb/host/xhci-pci.c | 1 - > drivers/usb/host/xhci.c | 1 + > 2 files changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c > index 11f16cb..67b9529 100644 > --- a/drivers/usb/host/xhci-pci.c > +++ b/drivers/usb/host/xhci-pci.c > @@ -230,7 +230,6 @@ static int xhci_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) > /* USB 2.0 roothub is stored in the PCI device now. */ > hcd = dev_get_drvdata(&dev->dev); > xhci = hcd_to_xhci(hcd); > - xhci->main_hcd = hcd; > xhci->shared_hcd = usb_create_shared_hcd(driver, &dev->dev, > pci_name(dev), hcd); > if (!xhci->shared_hcd) { > diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c > index 397c0dd..b14f572 100644 > --- a/drivers/usb/host/xhci.c > +++ b/drivers/usb/host/xhci.c > @@ -4842,6 +4842,7 @@ int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks) > */ > hcd->speed = HCD_USB2; > hcd->self.root_hub->speed = USB_SPEED_HIGH; > + xhci->main_hcd = hcd; > /* > * USB 2.0 roothub under xHCI has an integrated TT, > * (rate matching hub) as opposed to having an OHCI/UHCI Thanks, As your original patch causing this isn't out yet I'll undo this part from your 5/5 patch. (prevent broken xhci for some unlucky bisecter) -Mathias