* [PATCH] USB: array-index-out-of-bounds in ehci_brcm_hub_control
@ 2021-11-02 7:44 Haimin Zhang
2021-11-02 15:25 ` Alan Stern
0 siblings, 1 reply; 2+ messages in thread
From: Haimin Zhang @ 2021-11-02 7:44 UTC (permalink / raw)
To: gregkh, linux-usb, linux-kernel; +Cc: Haimin Zhang, TCS Robot
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 <tcs_kernel@tencent.com>
Reported-by: TCS Robot <tcs_robot@tencent.com>
---
drivers/usb/host/ehci-brcm.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/host/ehci-brcm.c b/drivers/usb/host/ehci-brcm.c
index d3626bfa966b..4ca3eb9fcda9 100644
--- a/drivers/usb/host/ehci-brcm.c
+++ b/drivers/usb/host/ehci-brcm.c
@@ -63,7 +63,8 @@ static int ehci_brcm_hub_control(
unsigned long flags;
int retval, irq_disabled = 0;
- status_reg = &ehci->regs->port_status[(wIndex & 0xff) - 1];
+ if (wIndex && wIndex <= ports)
+ status_reg = &ehci->regs->port_status[(wIndex & 0xff) - 1];
/*
* RESUME is cleared when GetPortStatus() is called 20ms after start
--
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] USB: array-index-out-of-bounds in ehci_brcm_hub_control
2021-11-02 7:44 [PATCH] USB: array-index-out-of-bounds in ehci_brcm_hub_control Haimin Zhang
@ 2021-11-02 15:25 ` Alan Stern
0 siblings, 0 replies; 2+ messages in thread
From: Alan Stern @ 2021-11-02 15:25 UTC (permalink / raw)
To: Haimin Zhang; +Cc: gregkh, linux-usb, linux-kernel, Haimin Zhang, TCS Robot
On Tue, Nov 02, 2021 at 03:44:46PM +0800, Haimin Zhang wrote:
> 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 <tcs_kernel@tencent.com>
> Reported-by: TCS Robot <tcs_robot@tencent.com>
> ---
> drivers/usb/host/ehci-brcm.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/usb/host/ehci-brcm.c b/drivers/usb/host/ehci-brcm.c
> index d3626bfa966b..4ca3eb9fcda9 100644
> --- a/drivers/usb/host/ehci-brcm.c
> +++ b/drivers/usb/host/ehci-brcm.c
> @@ -63,7 +63,8 @@ static int ehci_brcm_hub_control(
> unsigned long flags;
> int retval, irq_disabled = 0;
>
> - status_reg = &ehci->regs->port_status[(wIndex & 0xff) - 1];
> + if (wIndex && wIndex <= ports)
> + status_reg = &ehci->regs->port_status[(wIndex & 0xff) - 1];
This isn't quite right because it won't work properly if the upper byte
of wIndex is nonzero. You should do something like:
u32 temp;
temp = (wIndex & 0xff) - 1;
if (temp < ports)
status_reg = &ehci->regs->port_status[temp];
Alan Stern
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-11-02 15:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-11-02 7:44 [PATCH] USB: array-index-out-of-bounds in ehci_brcm_hub_control Haimin Zhang
2021-11-02 15:25 ` Alan Stern
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox