* [PATCH v4.4, v4.9] usb: dwc3: gadget: delay unmap of bounced requests
@ 2017-04-10 15:00 Felipe Balbi
2017-04-10 15:21 ` Greg Kroah-Hartman
0 siblings, 1 reply; 3+ messages in thread
From: Felipe Balbi @ 2017-04-10 15:00 UTC (permalink / raw)
To: stable
Cc: Greg Kroah-Hartman, nsekhar, rogerq, januszx.dziedzic, Felipe Balbi
From: Janusz Dziedzic <januszx.dziedzic@intel.com>
commit de288e36fe33f7e06fa272bc8e2f85aa386d99aa upstream.
In the case of bounced ep0 requests, we must delay DMA operation until
after ->complete() otherwise we might overwrite contents of req->buf.
This caused problems with RNDIS gadget.
Cc: <stable@vger.kernel.org> # v4.4 v4.9
Fixes: d62145929992 ("usb: dwc3: gadget: always unmap EP0 requests")
Signed-off-by: Janusz Dziedzic <januszx.dziedzic@intel.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
---
cherry-picked, fixed up and compile tested
drivers/usb/dwc3/gadget.c | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 5dc6bfc91f4b..ce603dcbd493 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -174,6 +174,7 @@ void dwc3_gadget_giveback(struct dwc3_ep *dep, struct dwc3_request *req,
int status)
{
struct dwc3 *dwc = dep->dwc;
+ unsigned int unmap_after_complete = false;
req->started = false;
list_del(&req->list);
@@ -182,11 +183,19 @@ void dwc3_gadget_giveback(struct dwc3_ep *dep, struct dwc3_request *req,
if (req->request.status == -EINPROGRESS)
req->request.status = status;
- if (dwc->ep0_bounced && dep->number <= 1)
+ /*
+ * NOTICE we don't want to unmap before calling ->complete() if we're
+ * dealing with a bounced ep0 request. If we unmap it here, we would end
+ * up overwritting the contents of req->buf and this could confuse the
+ * gadget driver.
+ */
+ if (dwc->ep0_bounced && dep->number <= 1) {
dwc->ep0_bounced = false;
-
- usb_gadget_unmap_request(&dwc->gadget, &req->request,
- req->direction);
+ unmap_after_complete = true;
+ } else {
+ usb_gadget_unmap_request(&dwc->gadget,
+ &req->request, req->direction);
+ }
trace_dwc3_gadget_giveback(req);
@@ -194,6 +203,10 @@ void dwc3_gadget_giveback(struct dwc3_ep *dep, struct dwc3_request *req,
usb_gadget_giveback_request(&dep->endpoint, &req->request);
spin_lock(&dwc->lock);
+ if (unmap_after_complete)
+ usb_gadget_unmap_request(&dwc->gadget,
+ &req->request, req->direction);
+
if (dep->number > 1)
pm_runtime_put(dwc->dev);
}
--
2.11.0.295.gd7dffce1ce
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v4.4, v4.9] usb: dwc3: gadget: delay unmap of bounced requests
2017-04-10 15:00 [PATCH v4.4, v4.9] usb: dwc3: gadget: delay unmap of bounced requests Felipe Balbi
@ 2017-04-10 15:21 ` Greg Kroah-Hartman
2017-04-11 7:02 ` Felipe Balbi
0 siblings, 1 reply; 3+ messages in thread
From: Greg Kroah-Hartman @ 2017-04-10 15:21 UTC (permalink / raw)
To: Felipe Balbi; +Cc: stable, nsekhar, rogerq, januszx.dziedzic
On Mon, Apr 10, 2017 at 06:00:07PM +0300, Felipe Balbi wrote:
> From: Janusz Dziedzic <januszx.dziedzic@intel.com>
>
> commit de288e36fe33f7e06fa272bc8e2f85aa386d99aa upstream.
>
> In the case of bounced ep0 requests, we must delay DMA operation until
> after ->complete() otherwise we might overwrite contents of req->buf.
>
> This caused problems with RNDIS gadget.
>
> Cc: <stable@vger.kernel.org> # v4.4 v4.9
> Fixes: d62145929992 ("usb: dwc3: gadget: always unmap EP0 requests")
> Signed-off-by: Janusz Dziedzic <januszx.dziedzic@intel.com>
> Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
> ---
>
> cherry-picked, fixed up and compile tested
This only would apply to 4.9-stable, 4.4-stable it still fails:
patching file drivers/usb/dwc3/gadget.c
Hunk #1 succeeded at 1193 with fuzz 2 (offset 1019 lines).
Hunk #2 FAILED at 183.
Hunk #3 FAILED at 195.
2 out of 3 hunks FAILED -- rejects in file drivers/usb/dwc3/gadget.c
Care to send one for that tree?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v4.4, v4.9] usb: dwc3: gadget: delay unmap of bounced requests
2017-04-10 15:21 ` Greg Kroah-Hartman
@ 2017-04-11 7:02 ` Felipe Balbi
0 siblings, 0 replies; 3+ messages in thread
From: Felipe Balbi @ 2017-04-11 7:02 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: stable, nsekhar, rogerq, januszx.dziedzic
[-- Attachment #1: Type: text/plain, Size: 1186 bytes --]
Hi,
Greg Kroah-Hartman <gregkh@linuxfoundation.org> writes:
> On Mon, Apr 10, 2017 at 06:00:07PM +0300, Felipe Balbi wrote:
>> From: Janusz Dziedzic <januszx.dziedzic@intel.com>
>>
>> commit de288e36fe33f7e06fa272bc8e2f85aa386d99aa upstream.
>>
>> In the case of bounced ep0 requests, we must delay DMA operation until
>> after ->complete() otherwise we might overwrite contents of req->buf.
>>
>> This caused problems with RNDIS gadget.
>>
>> Cc: <stable@vger.kernel.org> # v4.4 v4.9
>> Fixes: d62145929992 ("usb: dwc3: gadget: always unmap EP0 requests")
>> Signed-off-by: Janusz Dziedzic <januszx.dziedzic@intel.com>
>> Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
>> ---
>>
>> cherry-picked, fixed up and compile tested
>
> This only would apply to 4.9-stable, 4.4-stable it still fails:
> patching file drivers/usb/dwc3/gadget.c
> Hunk #1 succeeded at 1193 with fuzz 2 (offset 1019 lines).
> Hunk #2 FAILED at 183.
> Hunk #3 FAILED at 195.
> 2 out of 3 hunks FAILED -- rejects in file drivers/usb/dwc3/gadget.c
>
> Care to send one for that tree?
dang, don't remember that code changing. Will do it shortly.
--
balbi
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-04-11 7:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-10 15:00 [PATCH v4.4, v4.9] usb: dwc3: gadget: delay unmap of bounced requests Felipe Balbi
2017-04-10 15:21 ` Greg Kroah-Hartman
2017-04-11 7:02 ` Felipe Balbi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.