Jerome Brunet <jbru...@baylibre.com> writes:

> From: Jack Pham <ja...@codeaurora.org>
>
> As per the kernel doc for usb_ep_dequeue(), it states that "this
> routine is asynchronous, that is, it may return before the completion
> routine runs". And indeed since v5.0 the dwc3 gadget driver updated
> its behavior to place dequeued requests on to a cancelled list to be
> given back later after the endpoint is stopped.
>
> The free_ep() was incorrectly assuming that a request was ready to
> be freed after calling dequeue which results in a use-after-free
> in dwc3 when it traverses its cancelled list. Fix this by moving
> the usb_ep_free_request() call to the callback itself in case the
> ep is disabled.
>
> Fixes: eb9fecb9e69b0 ("usb: gadget: f_uac2: split out audio core")
> Reported-and-tested-by: Ferry Toth <fnt...@gmail.com>
> Reviewed-and-tested-by: Peter Chen <peter.c...@nxp.com>
> Signed-off-by: Jack Pham <ja...@codeaurora.org>
> Signed-off-by: Jerome Brunet <jbru...@baylibre.com>

Looks good to me, just one comment below:

> @@ -336,8 +341,9 @@ static inline void free_ep(struct uac_rtd_params *prm, 
> struct usb_ep *ep)
>  
>       for (i = 0; i < params->req_number; i++) {
>               if (prm->ureq[i].req) {
> -                     usb_ep_dequeue(ep, prm->ureq[i].req);
> -                     usb_ep_free_request(ep, prm->ureq[i].req);
> +                     if (usb_ep_dequeue(ep, prm->ureq[i].req))
> +                             usb_ep_free_request(ep, prm->ureq[i].req);

do you mind adding a comment here stating that this is coping with a
possible error during usb_ep_dequeue()?

Other than that:

Acked-by: Felipe Balbi <ba...@kernel.org>

-- 
balbi

Attachment: signature.asc
Description: PGP signature

Reply via email to