]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
usb: musb: host: fix potential NULL pointer dereference
authorBin Liu <b-liu@ti.com>
Mon, 30 Apr 2018 16:20:53 +0000 (11:20 -0500)
committerSasha Levin <alexander.levin@microsoft.com>
Wed, 23 May 2018 01:36:40 +0000 (21:36 -0400)
[ Upstream commit 2b63f1329df2cd814c1f8353fae4853ace6521d1 ]

musb_start_urb() doesn't check the pass-in parameter if it is NULL.  But
in musb_bulk_nak_timeout() the parameter passed to musb_start_urb() is
returned from first_qh(), which could be NULL.

So wrap the musb_start_urb() call here with a if condition check to
avoid the potential NULL pointer dereference.

Fixes: f283862f3b5c ("usb: musb: NAK timeout scheme on bulk TX endpoint")
Cc: stable@vger.kernel.org # v3.7+
Signed-off-by: Bin Liu <b-liu@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
drivers/usb/musb/musb_host.c

index 1d0c096c1b84a895ed8b774855be3b1d12d071f8..4b707d527855c70b5e3baff9a753ad4532176b40 100644 (file)
@@ -1002,7 +1002,9 @@ static void musb_bulk_nak_timeout(struct musb *musb, struct musb_hw_ep *ep,
                        /* set tx_reinit and schedule the next qh */
                        ep->tx_reinit = 1;
                }
-               musb_start_urb(musb, is_in, next_qh);
+
+               if (next_qh)
+                       musb_start_urb(musb, is_in, next_qh);
        }
 }