diff options
| author | Felipe Balbi <balbi@ti.com> | 2014-10-13 15:36:16 -0500 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2014-11-03 10:01:00 -0600 |
| commit | 73359cef4fcc322c96019b2a5c1e99b08f3bbb57 (patch) | |
| tree | 907cc918affc33da642894726af28cc9e43e9041 /drivers/usb/dwc3 | |
| parent | 06a374ed13fdb7c6b2edd8cbdcf52bd1b0cc67b9 (diff) | |
| download | op-kernel-dev-73359cef4fcc322c96019b2a5c1e99b08f3bbb57.zip op-kernel-dev-73359cef4fcc322c96019b2a5c1e99b08f3bbb57.tar.gz | |
usb: dwc3: gadget: WARN() on bogus usb_ep_queue()
Some gadget/function drivers might want to do
improper request recycling by allocating a single
request from one particular endpoint and queueing
it to another completely unrelated endpoint.
One such case was found with f_loopback.c.
To prevent such cases from happening again, let's
WARN() so we get a loud enough failure and persuade
users to report errors.
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/dwc3')
| -rw-r--r-- | drivers/usb/dwc3/gadget.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 12f4284..20e4ee9 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -1140,8 +1140,14 @@ static int dwc3_gadget_ep_queue(struct usb_ep *ep, struct usb_request *request, if (!dep->endpoint.desc) { dev_dbg(dwc->dev, "trying to queue request %p to disabled %s\n", request, ep->name); - spin_unlock_irqrestore(&dwc->lock, flags); - return -ESHUTDOWN; + ret = -ESHUTDOWN; + goto out; + } + + if (WARN(req->dep != dep, "request %p belongs to '%s'\n", + request, req->dep->name)) { + ret = -EINVAL; + goto out; } dev_vdbg(dwc->dev, "queing request %p to %s length %d\n", @@ -1149,6 +1155,8 @@ static int dwc3_gadget_ep_queue(struct usb_ep *ep, struct usb_request *request, trace_dwc3_ep_queue(req); ret = __dwc3_gadget_ep_queue(dep, req); + +out: spin_unlock_irqrestore(&dwc->lock, flags); return ret; |
