From: Haimin Zhang <tcs.kernel@gmail.com>
To: gregkh@linuxfoundation.org, linux-usb@vger.kernel.org
Cc: Haimin Zhang <tcs.kernel@gmail.com>, TCS Robot <tcs_robot@tencent.com>
Subject: [PATCH v3] USB: ehci_brcm_hub_control: improve port index sanitizing
Date: Fri, 12 Nov 2021 17:49:21 +0800 [thread overview]
Message-ID: <20211112094921.90496-1-tcs.kernel@gmail.com> (raw)
Due to (wIndex & 0xff) - 1 can get an integer greater than 0xf, this
can cause array index to be out of bounds since the size of array
port_status is 0xf. Using macro function HCS_N_PORTS() can return
a valid index less than 15. Macro function HCS_N_PORTS() is used
to obtain a valid port index by logical AND 0xf.
Reported-by: TCS Robot <tcs_robot@tencent.com>
Signed-off-by: Haimin Zhang <tcs.kernel@gmail.com>
---
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..d2bf7768349c 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;
+ temp = HCS_N_PORTS(temp);
+ status_reg = &ehci->regs->port_status[temp];
/*
* RESUME is cleared when GetPortStatus() is called 20ms after start
--
2.30.1 (Apple Git-130)
next reply other threads:[~2021-11-12 9:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-12 9:49 Haimin Zhang [this message]
2021-11-12 10:01 ` [PATCH v3] USB: ehci_brcm_hub_control: improve port index sanitizing Greg KH
2021-11-12 15:36 ` Alan Stern
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211112094921.90496-1-tcs.kernel@gmail.com \
--to=tcs.kernel@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-usb@vger.kernel.org \
--cc=tcs_robot@tencent.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox