2013-05-27 09:05:56

by George Cherian

[permalink] [raw]
Subject: [PATCH 1/4] usb: dwc3: gadget: free trb pool only from epnum 2

we never allocate a TRB pool for physical endpoints
0 and 1 so trying to free it (a invalid TRB pool pointer)
will lead us in a warning while removing dwc3.ko module.

In order to fix the situation, all we have to do is skip
dwc3_free_trb_pool() for physical endpoints 0 and 1 just
as we while deleting endpoints from the endpoints list.

Signed-off-by: George Cherian <[email protected]>
Signed-off-by: Felipe Balbi <[email protected]>
---
drivers/usb/dwc3/gadget.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 2b6e7e0..1c246f9 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -1706,12 +1706,20 @@ static void dwc3_gadget_free_endpoints(struct dwc3 *dwc)
dep = dwc->eps[epnum];
if (!dep)
continue;
+ /*
+ * physical endpoints 0 and 1 are special. They form the
+ * bi-directional USB endpoint 0.
+ *
+ * For those two physical endpoints, we don't allocate a TRB
+ * pool nor do we add them the endpoints list. Due to that, we
+ * should these two operations otherwise we would end up with
+ * all sorts of bugs when removing dwc3.ko.
+ */

- dwc3_free_trb_pool(dep);
-
- if (epnum != 0 && epnum != 1)
+ if (epnum != 0 && epnum != 1) {
+ dwc3_free_trb_pool(dep);
list_del(&dep->endpoint.ep_list);
-
+ }
kfree(dep);
}
}
--
1.8.1.4


2013-05-27 09:30:56

by George Cherian

[permalink] [raw]
Subject: RE: [PATCH 1/4] usb: dwc3: gadget: free trb pool only from epnum 2



> -----Original Message-----
> From: Cherian, George
> Sent: Monday, May 27, 2013 2:36 PM
> To: [email protected]; [email protected]; linux-
> [email protected]
> Cc: Balbi, Felipe; [email protected]; Cherian, George
> Subject: [PATCH 1/4] usb: dwc3: gadget: free trb pool only from epnum 2

Please read [PATCH 1/4] as [PATCH 1/1].
>
> we never allocate a TRB pool for physical endpoints
> 0 and 1 so trying to free it (a invalid TRB pool pointer)
> will lead us in a warning while removing dwc3.ko module.
>
> In order to fix the situation, all we have to do is skip
> dwc3_free_trb_pool() for physical endpoints 0 and 1 just
> as we while deleting endpoints from the endpoints list.
>
> Signed-off-by: George Cherian <[email protected]>
> Signed-off-by: Felipe Balbi <[email protected]>