From: liuc63 <liuc63@xiaopeng.com>
To: Peter Chen <peter.chen@kernel.org>
Cc: rogerq@kernel.org, pawell@cadence.com,
gregkh@linuxfoundation.org, stable@vger.kernel.org,
liuwb@xiaopeng.com, linux-usb@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v2] usb: cdns3: validate endpoint index from setup packet
Date: Mon, 12 Oct 2026 19:01:07 +0800 [thread overview]
Message-ID: <20261012110107.2458022-1-liuc63@xiaopeng.com> (raw)
From: Liu Chao <liuc63@xiaopeng.com>
cdns3_ep_addr_to_index() computes (ep_addr & 0x7F) + 16 for IN
endpoints. wIndex is supplied by the USB host, so ep_addr & 0x7F can
be up to 127, giving an index up to 143. The eps[] array has only
CDNS3_ENDPOINTS_MAX_COUNT (32) entries.
Both cdns3_req_ep0_get_status() (GET_STATUS) and
cdns3_ep0_feature_handle_endpoint() (SET/CLEAR_FEATURE) pass the
unvalidated index straight into priv_dev->eps[index] and then
dereference the result.
Besides the out-of-bounds index, eps[index] may also be NULL for
endpoints that are not enabled, as cdns3_init_eps() only populates
entries for endpoints enabled in USB_CAP3.
Add a bounds check against CDNS3_ENDPOINTS_MAX_COUNT together with a
NULL check in both functions, matching the fix already applied to
aspeed_udc in commit ee0d382feb44 ("usb: gadget: aspeed_udc: validate
endpoint index for ast udc").
Fixes: 7733f6c32e36 ("usb: cdns3: Add Cadence USB3 DRD Driver")
Cc: <stable@vger.kernel.org>
Reviewed-by: Weibin Liu <liuwb@xiaopeng.com>
Signed-off-by: Liu Chao <liuc63@xiaopeng.com>
---
Changes in v2:
- Also check priv_dev->eps[index] for NULL, as endpoints not enabled
in USB_CAP3 are left NULL by cdns3_init_eps() (Peter Chen)
- Correct the reference: the same-class fix ee0d382feb44 is for
aspeed_udc, not renesas_usb3; cite it with the commit title and
drop the CVE mention (Peter Chen)
- Fix the function name cdns3_ep0_handle_status() ->
cdns3_req_ep0_get_status() in the commit message
v1: https://lore.kernel.org/linux-usb/20260917103145.3047850-1-liuc63@xiaopeng.com/
---
drivers/usb/cdns3/cdns3-ep0.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/usb/cdns3/cdns3-ep0.c b/drivers/usb/cdns3/cdns3-ep0.c
index e29989d57..d26fa89b6 100644
--- a/drivers/usb/cdns3/cdns3-ep0.c
+++ b/drivers/usb/cdns3/cdns3-ep0.c
@@ -251,6 +251,9 @@ static int cdns3_req_ep0_get_status(struct cdns3_device *priv_dev,
return cdns3_ep0_delegate_req(priv_dev, ctrl);
case USB_RECIP_ENDPOINT:
index = cdns3_ep_addr_to_index(le16_to_cpu(ctrl->wIndex));
+ if (index >= CDNS3_ENDPOINTS_MAX_COUNT ||
+ !priv_dev->eps[index])
+ return -EINVAL;
priv_ep = priv_dev->eps[index];
/* check if endpoint is stalled or stall is pending */
@@ -368,6 +371,8 @@ static int cdns3_ep0_feature_handle_endpoint(struct cdns3_device *priv_dev,
return 0;
index = cdns3_ep_addr_to_index(le16_to_cpu(ctrl->wIndex));
+ if (index >= CDNS3_ENDPOINTS_MAX_COUNT || !priv_dev->eps[index])
+ return -EINVAL;
priv_ep = priv_dev->eps[index];
cdns3_select_ep(priv_dev, le16_to_cpu(ctrl->wIndex));
--
2.50.1
reply other threads:[~2026-10-12 11:01 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20261012110107.2458022-1-liuc63@xiaopeng.com \
--to=liuc63@xiaopeng.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=liuwb@xiaopeng.com \
--cc=pawell@cadence.com \
--cc=peter.chen@kernel.org \
--cc=rogerq@kernel.org \
--cc=stable@vger.kernel.org \
/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
all inboxes | Powered by JetHome®