Commit 1daf93b8 authored Mar 29, 2018 by Heinrich Schuchardt Committed by Greg Kroah-Hartman Apr 24, 2018

usb: musb: gadget: misplaced out of bounds check



commit af6f8529098aeb0e56a68671b450cf74e7a64fcd upstream.

musb->endpoints[] has array size MUSB_C_NUM_EPS.
We must check array bounds before accessing the array and not afterwards.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Bin Liu <b-liu@ti.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent b586f698

drivers/usb/musb/musb_gadget_ep0.c

+9 −5

Original line number	Diff line number	Diff line
		@@ -114,15 +114,19 @@ static int service_tx_status_request(
		}

		is_in = epnum & USB_DIR_IN;
		if (is_in) {
		epnum &= 0x0f;
		if (epnum >= MUSB_C_NUM_EPS) {
		handled = -EINVAL;
		break;
		}

		if (is_in)
		ep = &musb->endpoints[epnum].ep_in;
		} else {
		else
		ep = &musb->endpoints[epnum].ep_out;
		}
		regs = musb->endpoints[epnum].regs;

		if (epnum >= MUSB_C_NUM_EPS \|\| !ep->desc) {
		if (!ep->desc) {
		handled = -EINVAL;
		break;
		}