diff options
author | Bin Liu <b-liu@ti.com> | 2018-04-30 11:20:53 -0500 |
---|---|---|
committer | Sasha Levin <alexander.levin@microsoft.com> | 2018-05-22 21:36:40 -0400 |
commit | a82b0b8ad435f93b287832e32947d994a18d6796 (patch) | |
tree | 834070af541e5a0dee8f1d923cf275da3a9d66b6 | |
parent | a58e27f02868d084de8a8a56ff410a56b945c483 (diff) | |
download | linux-stable-a82b0b8ad435f93b287832e32947d994a18d6796.tar.gz |
usb: musb: host: fix potential NULL pointer dereference
[ 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>
-rw-r--r-- | drivers/usb/musb/musb_host.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c index 1d0c096c1b84..4b707d527855 100644 --- a/drivers/usb/musb/musb_host.c +++ b/drivers/usb/musb/musb_host.c @@ -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); } } |