All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alan Stern <stern@rowland.harvard.edu>
To: Greg KH <greg@kroah.com>, zhang haiming <tcs.kernel@gmail.com>
Cc: USB mailing list <linux-usb@vger.kernel.org>
Subject: [PATCH v5] USB: ehci_brcm_hub_control: Improve port index sanitizing
Date: Sat, 13 Nov 2021 11:53:20 -0500	[thread overview]
Message-ID: <20211113165320.GA59686@rowland.harvard.edu> (raw)
In-Reply-To: <CAB2z9eybMuHKj64OJhjcUTMR5Or5kR_PgCqHb-KPCuYrvOZ3ow@mail.gmail.com>

From: Haimin Zhang <tcs.kernel@gmail.com>

Due to (wIndex & 0xff) - 1 can get an integer greater than 15, this
can cause array index to be out of bounds since the size of array
port_status is 15. This change prevents a possible out-of-bounds
pointer computation by forcing the use of a valid port number.

Reported-by: TCS Robot <tcs_robot@tencent.com>
Signed-off-by: Haimin Zhang <tcs.kernel@gmail.com>
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>

---

v5 (Alan Stern):	Changed 0xf in patch description to 15.  Added
			comment explaining why the port index is sanitized.

 drivers/usb/host/ehci-brcm.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Index: usb-devel/drivers/usb/host/ehci-brcm.c
===================================================================
--- usb-devel.orig/drivers/usb/host/ehci-brcm.c
+++ usb-devel/drivers/usb/host/ehci-brcm.c
@@ -62,8 +62,12 @@ 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 >= HCS_N_PORTS_MAX)	/* Avoid index-out-of-bounds warning */
+		temp = 0;
+	status_reg = &ehci->regs->port_status[temp];
 
 	/*
 	 * RESUME is cleared when GetPortStatus() is called 20ms after start

      parent reply	other threads:[~2021-11-13 16:53 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-13  4:57 [PATCH v4] USB: ehci_brcm_hub_control: improve port index sanitizing Haimin Zhang
2021-11-13  8:13 ` Greg KH
2021-11-13 15:40 ` Alan Stern
     [not found]   ` <CAB2z9eybMuHKj64OJhjcUTMR5Or5kR_PgCqHb-KPCuYrvOZ3ow@mail.gmail.com>
2021-11-13 16:53     ` Alan Stern [this message]

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=20211113165320.GA59686@rowland.harvard.edu \
    --to=stern@rowland.harvard.edu \
    --cc=greg@kroah.com \
    --cc=linux-usb@vger.kernel.org \
    --cc=tcs.kernel@gmail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.