Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759171AbbLCInJ (ORCPT ); Thu, 3 Dec 2015 03:43:09 -0500 Received: from eusmtp01.atmel.com ([212.144.249.242]:9205 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758728AbbLCInH (ORCPT ); Thu, 3 Dec 2015 03:43:07 -0500 Subject: Re: [PATCH] USB: host: ohci-at91: fix a crash in ohci_hcd_at91_overcurrent_irq To: Alan Stern , Greg Kroah-Hartman References: <1449085015-5538-1-git-send-email-alexandre.belloni@free-electrons.com> CC: Alexandre Belloni , , Peter Rosin , , From: Nicolas Ferre Organization: atmel Message-ID: <566000A8.7070107@atmel.com> Date: Thu, 3 Dec 2015 09:43:20 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <1449085015-5538-1-git-send-email-alexandre.belloni@free-electrons.com> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.161.30.18] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2333 Lines: 78 Le 02/12/2015 20:36, Alexandre Belloni a ?crit : > The interrupt handler, ohci_hcd_at91_overcurrent_irq may be called right > after registration. At that time, pdev->dev.platform_data is not yet set, > leading to a NULL pointer dereference. > > Fixes: e4df92279fd9 (USB: host: ohci-at91: merge loops in ohci_hcd_at91_drv_probe) Yes, with: Cc: stable@vger.kernel.org # 4.3+ > Reported-by: Peter Rosin > Tested-by: Peter Rosin > Signed-off-by: Alexandre Belloni Acked-by: Nicolas Ferre Alan, I think it's a good candidate to enter the 4.4-rcX... Thanks, bye. > --- > drivers/usb/host/ohci-at91.c | 11 +++++------ > 1 file changed, 5 insertions(+), 6 deletions(-) > > diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c > index 342ffd140122..8c6e15bd6ff0 100644 > --- a/drivers/usb/host/ohci-at91.c > +++ b/drivers/usb/host/ohci-at91.c > @@ -473,6 +473,8 @@ static int ohci_hcd_at91_drv_probe(struct platform_device *pdev) > if (!pdata) > return -ENOMEM; > > + pdev->dev.platform_data = pdata; > + > if (!of_property_read_u32(np, "num-ports", &ports)) > pdata->ports = ports; > > @@ -483,6 +485,7 @@ static int ohci_hcd_at91_drv_probe(struct platform_device *pdev) > */ > if (i >= pdata->ports) { > pdata->vbus_pin[i] = -EINVAL; > + pdata->overcurrent_pin[i] = -EINVAL; > continue; > } > > @@ -513,10 +516,8 @@ static int ohci_hcd_at91_drv_probe(struct platform_device *pdev) > } > > at91_for_each_port(i) { > - if (i >= pdata->ports) { > - pdata->overcurrent_pin[i] = -EINVAL; > - continue; > - } > + if (i >= pdata->ports) > + break; > > pdata->overcurrent_pin[i] = > of_get_named_gpio_flags(np, "atmel,oc-gpio", i, &flags); > @@ -552,8 +553,6 @@ static int ohci_hcd_at91_drv_probe(struct platform_device *pdev) > } > } > > - pdev->dev.platform_data = pdata; > - > device_init_wakeup(&pdev->dev, 1); > return usb_hcd_at91_probe(&ohci_at91_hc_driver, pdev); > } > -- Nicolas Ferre -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/