[U-Boot] [PATCH v2 1/1] usb: musb-new: misplaced out of bounds check

[Heinrich Schuchardt]

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.g...@gmx.de>
---
v2
        do not move the ep->desc check
---
 drivers/usb/musb-new/musb_gadget_ep0.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/musb-new/musb_gadget_ep0.c 
b/drivers/usb/musb-new/musb_gadget_ep0.c
index 3cfcb2205a..aa57a7767d 100644
--- a/drivers/usb/musb-new/musb_gadget_ep0.c
+++ b/drivers/usb/musb-new/musb_gadget_ep0.c
@@ -95,6 +95,11 @@ static int service_tx_status_request(
                        break;
                }
 
+               if (epnum >= MUSB_C_NUM_EPS) {
+                       handled = -EINVAL;
+                       break;
+               }
+
                is_in = epnum & USB_DIR_IN;
                if (is_in) {
                        epnum &= 0x0f;
@@ -104,7 +109,7 @@ static int service_tx_status_request(
                }
                regs = musb->endpoints[epnum].regs;
 
-               if (epnum >= MUSB_C_NUM_EPS || !ep->desc) {
+               if (!ep->desc) {
                        handled = -EINVAL;
                        break;
                }
-- 
2.16.2

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot