Skip to content

Commit 26f296e

Browse files
matnymangregkh
authored andcommitted
xhci: fix memory leak regression when freeing xhci vdev devices depth first
commit edcbe06 upstream. Suspend-resume cycle test revealed a memory leak in 6.17-rc3 Turns out the slot_id race fix changes accidentally ends up calling xhci_free_virt_device() with an incorrect vdev parameter. The vdev variable was reused for temporary purposes right before calling xhci_free_virt_device(). Fix this by passing the correct vdev parameter. The slot_id race fix that caused this regression was targeted for stable, so this needs to be applied there as well. Fixes: 2eb0337 ("usb: xhci: Fix slot_id resource race conflict") Reported-by: David Wang <00107082@163.com> Closes: https://lore.kernel.org/linux-usb/20250829181354.4450-1-00107082@163.com Suggested-by: Michal Pecio <michal.pecio@gmail.com> Suggested-by: David Wang <00107082@163.com> Cc: stable@vger.kernel.org Tested-by: David Wang <00107082@163.com> Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> Link: https://lore.kernel.org/r/20250902105306.877476-4-mathias.nyman@linux.intel.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 0d861bc commit 26f296e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/usb/host/xhci-mem.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -945,7 +945,7 @@ static void xhci_free_virt_devices_depth_first(struct xhci_hcd *xhci, int slot_i
945945
out:
946946
/* we are now at a leaf device */
947947
xhci_debugfs_remove_slot(xhci, slot_id);
948-
xhci_free_virt_device(xhci, vdev, slot_id);
948+
xhci_free_virt_device(xhci, xhci->devs[slot_id], slot_id);
949949
}
950950

951951
int xhci_alloc_virt_device(struct xhci_hcd *xhci, int slot_id,

0 commit comments

Comments
 (0)