2021-11-05 11:00:05

by Haimin Zhang

[permalink] [raw]
Subject: [PATCH 1/2] USB: array-index-out-of-bounds in ehci_brcm_hub_control

There isn't enough check parameter `wIndex` in the function
`ehci_brcm_hub_control`;due to the size of array `port_status`
is 15, so it may lead to out of bounds.

Signed-off-by: Haimin Zhang <[email protected]>
Reported-by: TCS Robot <[email protected]>
---
drivers/usb/host/ehci-brcm.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/host/ehci-brcm.c b/drivers/usb/host/ehci-brcm.c
index d3626bfa966b..a1e3290e5459 100644
--- a/drivers/usb/host/ehci-brcm.c
+++ b/drivers/usb/host/ehci-brcm.c
@@ -62,8 +62,11 @@ static int ehci_brcm_hub_control(
u32 __iomem *status_reg;
unsigned long flags;
int retval, irq_disabled = 0;
+ u32 temp;

- status_reg = &ehci->regs->port_status[(wIndex & 0xff) - 1];
+ temp = (wIndex & 0xff) - 1;
+ if (temp < ports)
+ status_reg = &ehci->regs->port_status[temp];

/*
* RESUME is cleared when GetPortStatus() is called 20ms after start
--
2.30.1 (Apple Git-130)