Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09cbe7db authored by Yoshihiro Shimoda's avatar Yoshihiro Shimoda Committed by Sasha Levin
Browse files

usb: renesas_usbhs: fix to avoid using a disabled ep in usbhsg_queue_done() 



[ Upstream commit 4fccb0767fdbdb781a9c5b5c15ee7b219443c89d ]

This patch fixes an issue that usbhsg_queue_done() may cause kernel
panic when dma callback is running and usb_ep_disable() is called
by interrupt handler. (Especially, we can reproduce this issue using
g_audio with usb-dmac driver.)

For example of a flow:
 usbhsf_dma_complete (on tasklet)
  --> usbhsf_pkt_handler (on tasklet)
   --> usbhsg_queue_done (on tasklet)
    *** interrupt happened and usb_ep_disable() is called ***
    --> usbhsg_queue_pop (on tasklet)
     Then, oops happened.

Fixes: e73a9891 ("usb: renesas_usbhs: add DMAEngine support")
Cc: <stable@vger.kernel.org> # v3.1+
Signed-off-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent ccf7f209

drivers/usb/renesas_usbhs/mod_gadget.c

+5 −1
Original line number Diff line number Diff line
@@ -153,10 +153,14 @@ static void usbhsg_queue_done(struct usbhs_priv *priv, struct usbhs_pkt *pkt) 
	struct usbhs_pipe *pipe = pkt->pipe;

	struct usbhsg_uep *uep = usbhsg_pipe_to_uep(pipe);

	struct usbhsg_request *ureq = usbhsg_pkt_to_ureq(pkt);

	unsigned long flags;



	ureq->req.actual = pkt->actual;



	usbhsg_queue_pop(uep, ureq, 0);

	usbhs_lock(priv, flags);

	if (uep)

		__usbhsg_queue_pop(uep, ureq, 0);

	usbhs_unlock(priv, flags);

}



static void usbhsg_queue_push(struct usbhsg_uep *uep,