Skip to content

Commit 297f55b

Browse files
Janusz Dziedzicgregkh
authored andcommitted
usb: dwc3: gadget: delay unmap of bounced requests
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. Signed-off-by: Janusz Dziedzic <januszx.dziedzic@intel.com> Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 8cfaf0a commit 297f55b

1 file changed

Lines changed: 17 additions & 4 deletions

File tree

drivers/usb/dwc3/gadget.c

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,7 @@ void dwc3_gadget_giveback(struct dwc3_ep *dep, struct dwc3_request *req,
235235
int status)
236236
{
237237
struct dwc3 *dwc = dep->dwc;
238+
unsigned int unmap_after_complete = false;
238239
int i;
239240

240241
if (req->queued) {
@@ -259,11 +260,19 @@ void dwc3_gadget_giveback(struct dwc3_ep *dep, struct dwc3_request *req,
259260
if (req->request.status == -EINPROGRESS)
260261
req->request.status = status;
261262

262-
if (dwc->ep0_bounced && dep->number <= 1)
263+
/*
264+
* NOTICE we don't want to unmap before calling ->complete() if we're
265+
* dealing with a bounced ep0 request. If we unmap it here, we would end
266+
* up overwritting the contents of req->buf and this could confuse the
267+
* gadget driver.
268+
*/
269+
if (dwc->ep0_bounced && dep->number <= 1) {
263270
dwc->ep0_bounced = false;
264-
265-
usb_gadget_unmap_request(&dwc->gadget, &req->request,
266-
req->direction);
271+
unmap_after_complete = true;
272+
} else {
273+
usb_gadget_unmap_request(&dwc->gadget,
274+
&req->request, req->direction);
275+
}
267276

268277
dev_dbg(dwc->dev, "request %p from %s completed %d/%d ===> %d\n",
269278
req, dep->name, req->request.actual,
@@ -273,6 +282,10 @@ void dwc3_gadget_giveback(struct dwc3_ep *dep, struct dwc3_request *req,
273282
spin_unlock(&dwc->lock);
274283
usb_gadget_giveback_request(&dep->endpoint, &req->request);
275284
spin_lock(&dwc->lock);
285+
286+
if (unmap_after_complete)
287+
usb_gadget_unmap_request(&dwc->gadget,
288+
&req->request, req->direction);
276289
}
277290

278291
int dwc3_send_gadget_generic_command(struct dwc3 *dwc, unsigned cmd, u32 param)

0 commit comments

Comments
 (0)