Commit edcbe064 authored by Mathias Nyman's avatar Mathias Nyman Committed by Greg Kroah-Hartman
Browse files

xhci: fix memory leak regression when freeing xhci vdev devices depth first 



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: 2eb03376 ("usb: xhci: Fix slot_id resource race conflict")
Reported-by: default avatarDavid Wang <00107082@163.com>
Closes: https://lore.kernel.org/linux-usb/20250829181354.4450-1-00107082@163.com


Suggested-by: default avatarMichal Pecio <michal.pecio@gmail.com>
Suggested-by: default avatarDavid Wang <00107082@163.com>
Cc: stable@vger.kernel.org
Tested-by: default avatarDavid Wang <00107082@163.com>
Signed-off-by: default avatarMathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20250902105306.877476-4-mathias.nyman@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a5c98e8b

drivers/usb/host/xhci-mem.c

+1 −1
Original line number Diff line number Diff line
@@ -962,7 +962,7 @@ static void xhci_free_virt_devices_depth_first(struct xhci_hcd *xhci, int slot_i 
out:

	/* we are now at a leaf device */

	xhci_debugfs_remove_slot(xhci, slot_id);

	xhci_free_virt_device(xhci, vdev, slot_id);

	xhci_free_virt_device(xhci, xhci->devs[slot_id], slot_id);

}



int xhci_alloc_virt_device(struct xhci_hcd *xhci, int slot_id,