2014-09-27 19:10:51 +00:00
|
|
|
From 53d7fd1afe9f150cbb97e6fe513aa2be32f30e1a Mon Sep 17 00:00:00 2001
|
2014-02-28 20:30:08 +00:00
|
|
|
From: P33M <P33M@github.com>
|
|
|
|
|
Date: Mon, 5 Aug 2013 13:17:58 +0100
|
2014-09-27 19:10:51 +00:00
|
|
|
Subject: [PATCH 089/196] dwc_otg: prevent leaking URBs during enqueue
|
2014-02-28 20:30:08 +00:00
|
|
|
|
|
|
|
|
A dwc_otg_urb would get leaked if the HCD enqueue function
|
|
|
|
|
failed for any reason. Free the URB at the appropriate points.
|
|
|
|
|
---
|
|
|
|
|
drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c | 8 ++++++++
|
|
|
|
|
1 file changed, 8 insertions(+)
|
|
|
|
|
|
2014-09-27 19:10:51 +00:00
|
|
|
diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c
|
|
|
|
|
index 0d49b50..d3949da 100644
|
2014-02-28 20:30:08 +00:00
|
|
|
--- a/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c
|
|
|
|
|
+++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd_linux.c
|
2014-09-27 19:10:51 +00:00
|
|
|
@@ -797,11 +797,19 @@ static int dwc_otg_urb_enqueue(struct usb_hcd *hcd,
|
2014-02-28 20:30:08 +00:00
|
|
|
#if USB_URB_EP_LINKING
|
|
|
|
|
usb_hcd_unlink_urb_from_ep(hcd, urb);
|
|
|
|
|
#endif
|
|
|
|
|
+ DWC_FREE(dwc_otg_urb);
|
|
|
|
|
urb->hcpriv = NULL;
|
|
|
|
|
if (retval == -DWC_E_NO_DEVICE)
|
|
|
|
|
retval = -ENODEV;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
+#if USB_URB_EP_LINKING
|
|
|
|
|
+ else
|
|
|
|
|
+ {
|
|
|
|
|
+ DWC_FREE(dwc_otg_urb);
|
|
|
|
|
+ urb->hcpriv = NULL;
|
|
|
|
|
+ }
|
|
|
|
|
+#endif
|
|
|
|
|
DWC_SPINUNLOCK_IRQRESTORE(dwc_otg_hcd->lock, irqflags);
|
|
|
|
|
return retval;
|
|
|
|
|
}
|
2014-09-27 19:10:51 +00:00
|
|
|
--
|
|
|
|
|
1.9.1
|
|
|
|
|
|
