From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Date: Thu, 2 Feb 2023 16:32:25 +0100

Subject: [PATCH] USB: uhci: fix memory leak with using debugfs_lookup()

References: bsc#1012628

Patch-mainline: 6.2.5

Git-commit: 0a3f82c79c86278e7f144564b1cb6cc5c3657144

[ Upstream commit 0a3f82c79c86278e7f144564b1cb6cc5c3657144 ]

When calling debugfs_lookup() the result must have dput() called on it,

otherwise the memory will leak over time.  To make things simpler, just

call debugfs_lookup_and_remove() instead which handles all of the logic

at once.

Cc: Alan Stern <stern@rowland.harvard.edu>

Link: https://lore.kernel.org/r/20230202153235.2412790-3-gregkh@linuxfoundation.org

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Signed-off-by: Sasha Levin <sashal@kernel.org>

Signed-off-by: Jiri Slaby <jslaby@suse.cz>

---

 drivers/usb/host/uhci-hcd.c | 6 +++---

 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c

index c22b51af..7cdc2fa7 100644

--- a/drivers/usb/host/uhci-hcd.c

+++ b/drivers/usb/host/uhci-hcd.c

@@ -536,8 +536,8 @@ static void release_uhci(struct uhci_hcd *uhci)

 	uhci->is_initialized = 0;

 	spin_unlock_irq(&uhci->lock);

-	debugfs_remove(debugfs_lookup(uhci_to_hcd(uhci)->self.bus_name,

-				      uhci_debugfs_root));

+	debugfs_lookup_and_remove(uhci_to_hcd(uhci)->self.bus_name,

+				  uhci_debugfs_root);

 	for (i = 0; i < UHCI_NUM_SKELQH; i++)

 		uhci_free_qh(uhci, uhci->skelqh[i]);

@@ -700,7 +700,7 @@ static int uhci_start(struct usb_hcd *hcd)

 			uhci->frame, uhci->frame_dma_handle);

 err_alloc_frame:

-	debugfs_remove(debugfs_lookup(hcd->self.bus_name, uhci_debugfs_root));

+	debugfs_lookup_and_remove(hcd->self.bus_name, uhci_debugfs_root);

 	return retval;

 }

-- 

2.35.3