From: Michal Pecio <michal.pecio@gmail.com>
To: Mathias Nyman <mathias.nyman@linux.intel.com>
Cc: David Wang <00107082@163.com>,
WeitaoWang-oc@zhaoxin.com, gregkh@linuxfoundation.org,
linux-usb@vger.kernel.org, regressions@lists.linux.dev,
linux-kernel@vger.kernel.org, surenb@google.com,
kent.overstreet@linux.dev
Subject: [PATCH] usb: xhci: Fix xhci_free_virt_devices_depth_first()
Date: Tue, 2 Sep 2025 09:30:17 +0200 [thread overview]
Message-ID: <20250902093017.13d6c666.michal.pecio@gmail.com> (raw)
In-Reply-To: <f9476552-a6dc-4f1c-91da-b15c8f0d9844@linux.intel.com>
Reusing 'vdev' for iteration caused a recent commit to malfunction
uexpectedly, resulting in a reported memory leak and potential UAF
if devices are freed in bad order. Using a second variable solves
this problem, and maybe others later.
HCS_MAX_SLOTS(xhci->hcs_params1) is the highest possible slot_id,
so change the iteration range to include it. Currently this doesn't
seem to cause problems because the only caller begins with freeing
the topmost slot_id, but it breaks documented functionality.
Reported-by: David Wang <00107082@163.com>
Closes: https://lore.kernel.org/linux-usb/20250829181354.4450-1-00107082@163.com/
Fixes: 2eb03376151b ("usb: xhci: Fix slot_id resource race conflict")
Fixes: ee8665e28e8d ("xhci: free xhci virtual devices with leaf nodes first")
Cc: stable@vger.kernel.org
Signed-off-by: Michal Pecio <michal.pecio@gmail.com>
---
drivers/usb/host/xhci-mem.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
index eed5926b200e..db7dc70c37e5 100644
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@ -932,7 +932,7 @@ void xhci_free_virt_device(struct xhci_hcd *xhci, struct xhci_virt_device *dev,
*/
static void xhci_free_virt_devices_depth_first(struct xhci_hcd *xhci, int slot_id)
{
- struct xhci_virt_device *vdev;
+ struct xhci_virt_device *vdev, *vdev_i;
struct list_head *tt_list_head;
struct xhci_tt_bw_info *tt_info, *next;
int i;
@@ -951,9 +951,9 @@ static void xhci_free_virt_devices_depth_first(struct xhci_hcd *xhci, int slot_i
/* is this a hub device that added a tt_info to the tts list */
if (tt_info->slot_id == slot_id) {
/* are any devices using this tt_info? */
- for (i = 1; i < HCS_MAX_SLOTS(xhci->hcs_params1); i++) {
- vdev = xhci->devs[i];
- if (vdev && (vdev->tt_info == tt_info))
+ for (i = 1; i <= HCS_MAX_SLOTS(xhci->hcs_params1); i++) {
+ vdev_i = xhci->devs[i];
+ if (vdev_i && (vdev_i->tt_info == tt_info))
xhci_free_virt_devices_depth_first(
xhci, i);
}
--
2.48.1
next prev parent reply other threads:[~2025-09-02 7:30 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-29 18:13 [REGRESSION 6.17-rc3] usb/xhci: possible memory leak after suspend/resume cycle David Wang
2025-08-30 9:48 ` Michał Pecio
2025-08-30 10:06 ` David Wang
2025-08-30 10:17 ` David Wang
2025-09-01 10:14 ` Mathias Nyman
2025-09-01 11:17 ` David Wang
2025-09-02 7:30 ` Michal Pecio [this message]
2025-09-02 8:30 ` Re:[PATCH] usb: xhci: Fix xhci_free_virt_devices_depth_first() David Wang
2025-09-02 8:46 ` [PATCH] " Michał Pecio
2025-09-02 9:07 ` Michał Pecio
2025-09-02 10:13 ` Mathias Nyman
2025-09-02 10:55 ` Michał Pecio
2025-09-02 12:58 ` Mathias Nyman
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=20250902093017.13d6c666.michal.pecio@gmail.com \
--to=michal.pecio@gmail.com \
--cc=00107082@163.com \
--cc=WeitaoWang-oc@zhaoxin.com \
--cc=gregkh@linuxfoundation.org \
--cc=kent.overstreet@linux.dev \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=mathias.nyman@linux.intel.com \
--cc=regressions@lists.linux.dev \
--cc=surenb@google.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;
as well as URLs for NNTP newsgroup(s).