From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BB559C7EE39 for ; Fri, 3 Mar 2023 21:45:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232203AbjCCVpD (ORCPT ); Fri, 3 Mar 2023 16:45:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232256AbjCCVo2 (ORCPT ); Fri, 3 Mar 2023 16:44:28 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A35164203; Fri, 3 Mar 2023 13:43:44 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id C473AB81A09; Fri, 3 Mar 2023 21:42:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D206EC433D2; Fri, 3 Mar 2023 21:42:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677879738; bh=uuFptdgdXONQlpP314S7OqYZlmrK8PnW/w/gUmsCNCQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fEeNlBfprvXjIRCmcfN0FV/Br5QX/72TN9IxNa8AmuLoP1h5mqQBpPEJ8b50C1Lap Azy2VwaZawO+tqunnnuhJVYcsPuC2F88vh2Y1LQecaZQ1ZAKMj+NfF5AGjl1r96zED Y39zLNbX49hfnOjh3Zx65dnbYFnwI2ayjtTM2+znuZjZVnVmDSnZPG6W6d1OWDUwL0 UnGGYiaKZa2EcXlGbDNrSksrWLUoFVk3Jbdlbll2tzPvZQ7W4y53B2p6EcfEZCY04m pp00BtiAErQbeZx7+adaPxsY1GIE9flEMpOlDaujVyHioHTNUcuzK7TSKWfsaOePLg Pxn/ISjAC1o4A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Greg Kroah-Hartman , Alan Stern , Sasha Levin , linux-usb@vger.kernel.org Subject: [PATCH AUTOSEL 6.2 33/64] USB: uhci: fix memory leak with using debugfs_lookup() Date: Fri, 3 Mar 2023 16:40:35 -0500 Message-Id: <20230303214106.1446460-33-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230303214106.1446460-1-sashal@kernel.org> References: <20230303214106.1446460-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org From: Greg Kroah-Hartman [ 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 Link: https://lore.kernel.org/r/20230202153235.2412790-3-gregkh@linuxfoundation.org Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- 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 c22b51af83fcb..7cdc2fa7c28fb 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.39.2