* [PATCH v1 1/1] usb: dwc3: Fix NULL pointer exception in dwc3_pci_remove()
@ 2018-10-17 18:40 Kuppuswamy Sathyanarayanan
2018-11-12 18:11 ` sathyanarayanan kuppuswamy
0 siblings, 1 reply; 2+ messages in thread
From: Kuppuswamy Sathyanarayanan @ 2018-10-17 18:40 UTC (permalink / raw)
To: balbi, gregkh; +Cc: linux-usb, linux-kernel, sathyanarayanan.kuppuswamy, stable
In dwc3_pci_quirks() function, gpiod lookup table is only registered for
baytrail SOC. But in dwc3_pci_remove(), we try to unregistered it
without any checks. This leads to NULL pointer de-reference exception in
gpiod_remove_lookup_table() when unloading the module for non baytrail
SOCs. This patch fixes this issue.
Fixes: 5741022cbdf3 ("usb: dwc3: pci: Add GPIO lookup table on platforms
without ACPI GPIO resources")
Cc: <stable@vger.kernel.org>
Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
drivers/usb/dwc3/dwc3-pci.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c
index 1286076a8890..842795856bf4 100644
--- a/drivers/usb/dwc3/dwc3-pci.c
+++ b/drivers/usb/dwc3/dwc3-pci.c
@@ -283,8 +283,10 @@ static int dwc3_pci_probe(struct pci_dev *pci, const struct pci_device_id *id)
static void dwc3_pci_remove(struct pci_dev *pci)
{
struct dwc3_pci *dwc = pci_get_drvdata(pci);
+ struct pci_dev *pdev = dwc->pci;
- gpiod_remove_lookup_table(&platform_bytcr_gpios);
+ if (pdev->device == PCI_DEVICE_ID_INTEL_BYT)
+ gpiod_remove_lookup_table(&platform_bytcr_gpios);
#ifdef CONFIG_PM
cancel_work_sync(&dwc->wakeup_work);
#endif
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v1 1/1] usb: dwc3: Fix NULL pointer exception in dwc3_pci_remove()
2018-10-17 18:40 [PATCH v1 1/1] usb: dwc3: Fix NULL pointer exception in dwc3_pci_remove() Kuppuswamy Sathyanarayanan
@ 2018-11-12 18:11 ` sathyanarayanan kuppuswamy
0 siblings, 0 replies; 2+ messages in thread
From: sathyanarayanan kuppuswamy @ 2018-11-12 18:11 UTC (permalink / raw)
To: balbi, gregkh; +Cc: linux-usb, linux-kernel, stable
Felipe/Greg,
Any comments ?
On 10/17/18 11:40 AM, Kuppuswamy Sathyanarayanan wrote:
> In dwc3_pci_quirks() function, gpiod lookup table is only registered for
> baytrail SOC. But in dwc3_pci_remove(), we try to unregistered it
> without any checks. This leads to NULL pointer de-reference exception in
> gpiod_remove_lookup_table() when unloading the module for non baytrail
> SOCs. This patch fixes this issue.
>
> Fixes: 5741022cbdf3 ("usb: dwc3: pci: Add GPIO lookup table on platforms
> without ACPI GPIO resources")
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> ---
> drivers/usb/dwc3/dwc3-pci.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c
> index 1286076a8890..842795856bf4 100644
> --- a/drivers/usb/dwc3/dwc3-pci.c
> +++ b/drivers/usb/dwc3/dwc3-pci.c
> @@ -283,8 +283,10 @@ static int dwc3_pci_probe(struct pci_dev *pci, const struct pci_device_id *id)
> static void dwc3_pci_remove(struct pci_dev *pci)
> {
> struct dwc3_pci *dwc = pci_get_drvdata(pci);
> + struct pci_dev *pdev = dwc->pci;
>
> - gpiod_remove_lookup_table(&platform_bytcr_gpios);
> + if (pdev->device == PCI_DEVICE_ID_INTEL_BYT)
> + gpiod_remove_lookup_table(&platform_bytcr_gpios);
> #ifdef CONFIG_PM
> cancel_work_sync(&dwc->wakeup_work);
> #endif
--
Sathyanarayanan Kuppuswamy
Linux kernel developer
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-11-12 18:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-17 18:40 [PATCH v1 1/1] usb: dwc3: Fix NULL pointer exception in dwc3_pci_remove() Kuppuswamy Sathyanarayanan
2018-11-12 18:11 ` sathyanarayanan kuppuswamy
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).