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

Commit fc1ecea7 authored by Xingxing Luo's avatar Xingxing Luo Committed by Greg Kroah-Hartman
Browse files

usb: musb: Get the musb_qh poniter after musb_giveback



commit 33d7e37232155aadebe4145dcc592f00dabd7a2b upstream.

When multiple threads are performing USB transmission, musb->lock will be
unlocked when musb_giveback is executed. At this time, qh may be released
in the dequeue process in other threads, resulting in a wild pointer, so
it needs to be here get qh again, and judge whether qh is NULL, and when
dequeue, you need to set qh to NULL.

Fixes: dbac5d07 ("usb: musb: host: don't start next rx urb if current one failed")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarXingxing Luo <xingxing.luo@unisoc.com>
Link: https://lore.kernel.org/r/20230919033055.14085-1-xingxing.luo@unisoc.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c0fb0419
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -339,10 +339,16 @@ static void musb_advance_schedule(struct musb *musb, struct urb *urb,
	musb_giveback(musb, urb, status);
	qh->is_ready = ready;

	/*
	 * musb->lock had been unlocked in musb_giveback, so qh may
	 * be freed, need to get it again
	 */
	qh = musb_ep_get_qh(hw_ep, is_in);

	/* reclaim resources (and bandwidth) ASAP; deschedule it, and
	 * invalidate qh as soon as list_empty(&hep->urb_list)
	 */
	if (list_empty(&qh->hep->urb_list)) {
	if (qh && list_empty(&qh->hep->urb_list)) {
		struct list_head	*head;
		struct dma_controller	*dma = musb->dma_controller;

@@ -2424,6 +2430,7 @@ static int musb_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
		 * and its URB list has emptied, recycle this qh.
		 */
		if (ready && list_empty(&qh->hep->urb_list)) {
			musb_ep_set_qh(qh->hw_ep, is_in, NULL);
			qh->hep->hcpriv = NULL;
			list_del(&qh->ring);
			kfree(qh);