evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

usb: musb: gadget: misplaced out of bounds check

Browse source 
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>
This commit is contained in:
Heinrich Schuchardt 2018-03-29 10:48:28 -05:00 • committed by Greg Kroah-Hartman
parent 5a310ab03d
commit e230078950
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/usb/musb/musb_gadget_ep0.c
View file

@ -114,15 +114,19 @@ static int service_tx_status_request(
} }
is_in = epnum & USB_DIR_IN; is_in = epnum & USB_DIR_IN;
if (is_in) {
epnum &= 0x0f; epnum &= 0x0f;
ep = &musb->endpoints[epnum].ep_in; if (epnum >= MUSB_C_NUM_EPS) {
} else { handled = -EINVAL;
ep = &musb->endpoints[epnum].ep_out; break;
} }
if (is_in)
ep = &musb->endpoints[epnum].ep_in;
else
ep = &musb->endpoints[epnum].ep_out;
regs = musb->endpoints[epnum].regs; regs = musb->endpoints[epnum].regs;
if (epnum >= MUSB_C_NUM_EPS || !ep->desc) { if (!ep->desc) {
handled = -EINVAL; handled = -EINVAL;
break; break;
} }