| From 72abe0c544411864d5d9e678feeb604971ada939 Mon Sep 17 00:00:00 2001 |
| From: Minas Harutyunyan <Minas.Harutyunyan@synopsys.com> |
| Date: Tue, 21 Jan 2020 14:24:04 +0400 |
| Subject: [PATCH] usb: dwc2: Fix in ISOC request length checking |
| |
| commit 860ef6cd3f90b84a1832f8a6485c90c34d3b588b upstream. |
| |
| Moved ISOC request length checking from dwc2_hsotg_start_req() function to |
| dwc2_hsotg_ep_queue(). |
| |
| Fixes: 4fca54aa58293 ("usb: gadget: s3c-hsotg: add multi count support") |
| Signed-off-by: Minas Harutyunyan <hminas@synopsys.com> |
| Signed-off-by: Felipe Balbi <balbi@kernel.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c |
| index 3b1024b97a47..58721d9703b2 100644 |
| --- a/drivers/usb/dwc2/gadget.c |
| +++ b/drivers/usb/dwc2/gadget.c |
| @@ -1083,11 +1083,6 @@ static void dwc2_hsotg_start_req(struct dwc2_hsotg *hsotg, |
| else |
| packets = 1; /* send one packet if length is zero. */ |
| |
| - if (hs_ep->isochronous && length > (hs_ep->mc * hs_ep->ep.maxpacket)) { |
| - dev_err(hsotg->dev, "req length > maxpacket*mc\n"); |
| - return; |
| - } |
| - |
| if (dir_in && index != 0) |
| if (hs_ep->isochronous) |
| epsize = DXEPTSIZ_MC(packets); |
| @@ -1391,6 +1386,13 @@ static int dwc2_hsotg_ep_queue(struct usb_ep *ep, struct usb_request *req, |
| req->actual = 0; |
| req->status = -EINPROGRESS; |
| |
| + /* Don't queue ISOC request if length greater than mps*mc */ |
| + if (hs_ep->isochronous && |
| + req->length > (hs_ep->mc * hs_ep->ep.maxpacket)) { |
| + dev_err(hs->dev, "req length > maxpacket*mc\n"); |
| + return -EINVAL; |
| + } |
| + |
| /* In DDMA mode for ISOC's don't queue request if length greater |
| * than descriptor limits. |
| */ |
| -- |
| 2.7.4 |
| |
