Skip to contentSkip to conversation

FAILED: patch "[PATCH] usb: dwc2: Fix in ISOC request length checking" failed to apply to 4.9-stable tree

PATCH [email protected] 1 participant 1 message Feb 27, 2020

Subsystems (3)
Stable branch USB DesignWare USB2 DRD IP driver
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 4.9-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 860ef6cd3f90b84a1832f8a6485c90c34d3b588b Mon Sep 17 00:00:00 2001
From: Minas Harutyunyan <[email protected]>
Date: Tue, 21 Jan 2020 14:24:04 +0400
Subject: [PATCH] usb: dwc2: Fix in ISOC request length checking

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 <[email protected]>
Signed-off-by Felipe Balbi <[email protected]>
drivers/usb/dwc2/gadget.c +7 -5
index 88f7d6d4ff2d..7b40cf5bdc2f 100644
@@ -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.
 	 */