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 E3780C7EE39 for ; Fri, 3 Mar 2023 21:47:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232611AbjCCVrj (ORCPT ); Fri, 3 Mar 2023 16:47:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232531AbjCCVrX (ORCPT ); Fri, 3 Mar 2023 16:47:23 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF8D84B835; Fri, 3 Mar 2023 13:44:51 -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 7020FB81A0F; Fri, 3 Mar 2023 21:42:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9F8E4C4339C; Fri, 3 Mar 2023 21:42:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677879771; bh=F9liIfmRQVktoAn8wyKTNdmFd0qpqDIml8xV+QZbMDM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CjxrVuNQ0Q19ONL6W3dfrBzhIBwviBy7q01TL/uB8dfKyYsDDlucIE5+V8YCoC61L 2/Y5D7RwGeiiw1alQrXofNIPPFqslY4QM+Shw7JUsqkgDrmaXxGYVM7C4hclDAR/Dt TG4+rCRnY3f89Ki2ZFuEvMEYh9jz1FYRcsoC8XSZoskf30O2xSpkOxYvDV37YtIrTJ rxfY1jqZgS754HI+iy+RE/Wh2s3c7TGgZT09paJs2SfoBI80Gnm79oJDxyHiFFFNRP tjALJtEx0PLHCAxl+iCMato+OHIJin0J2Jug3RIhoJRXZzXb5+pzqDnmJcsWvWezEO aQrmalcZRL8fw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Greg Kroah-Hartman , "Rafael J. Wysocki" , Sasha Levin , dri-devel@lists.freedesktop.org Subject: [PATCH AUTOSEL 6.2 52/64] drivers: base: component: fix memory leak with using debugfs_lookup() Date: Fri, 3 Mar 2023 16:40:54 -0500 Message-Id: <20230303214106.1446460-52-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: stable@vger.kernel.org From: Greg Kroah-Hartman [ Upstream commit 8deb87b1e810dd558371e88ffd44339fbef27870 ] 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: "Rafael J. Wysocki" Link: https://lore.kernel.org/r/20230202141621.2296458-1-gregkh@linuxfoundation.org Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/base/component.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/base/component.c b/drivers/base/component.c index 5eadeac6c5322..7dbf14a1d9157 100644 --- a/drivers/base/component.c +++ b/drivers/base/component.c @@ -125,7 +125,7 @@ static void component_debugfs_add(struct aggregate_device *m) static void component_debugfs_del(struct aggregate_device *m) { - debugfs_remove(debugfs_lookup(dev_name(m->parent), component_debugfs_dir)); + debugfs_lookup_and_remove(dev_name(m->parent), component_debugfs_dir); } #else -- 2.39.2 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 49E15C64EC4 for ; Fri, 3 Mar 2023 21:42:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 70A7010E761; Fri, 3 Mar 2023 21:42:54 +0000 (UTC) Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1788F10E765 for ; Fri, 3 Mar 2023 21:42:53 +0000 (UTC) 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 811EFB81A02; Fri, 3 Mar 2023 21:42:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9F8E4C4339C; Fri, 3 Mar 2023 21:42:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677879771; bh=F9liIfmRQVktoAn8wyKTNdmFd0qpqDIml8xV+QZbMDM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CjxrVuNQ0Q19ONL6W3dfrBzhIBwviBy7q01TL/uB8dfKyYsDDlucIE5+V8YCoC61L 2/Y5D7RwGeiiw1alQrXofNIPPFqslY4QM+Shw7JUsqkgDrmaXxGYVM7C4hclDAR/Dt TG4+rCRnY3f89Ki2ZFuEvMEYh9jz1FYRcsoC8XSZoskf30O2xSpkOxYvDV37YtIrTJ rxfY1jqZgS754HI+iy+RE/Wh2s3c7TGgZT09paJs2SfoBI80Gnm79oJDxyHiFFFNRP tjALJtEx0PLHCAxl+iCMato+OHIJin0J2Jug3RIhoJRXZzXb5+pzqDnmJcsWvWezEO aQrmalcZRL8fw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 6.2 52/64] drivers: base: component: fix memory leak with using debugfs_lookup() Date: Fri, 3 Mar 2023 16:40:54 -0500 Message-Id: <20230303214106.1446460-52-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 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sasha Levin , Greg Kroah-Hartman , dri-devel@lists.freedesktop.org, "Rafael J. Wysocki" Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Greg Kroah-Hartman [ Upstream commit 8deb87b1e810dd558371e88ffd44339fbef27870 ] 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: "Rafael J. Wysocki" Link: https://lore.kernel.org/r/20230202141621.2296458-1-gregkh@linuxfoundation.org Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/base/component.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/base/component.c b/drivers/base/component.c index 5eadeac6c5322..7dbf14a1d9157 100644 --- a/drivers/base/component.c +++ b/drivers/base/component.c @@ -125,7 +125,7 @@ static void component_debugfs_add(struct aggregate_device *m) static void component_debugfs_del(struct aggregate_device *m) { - debugfs_remove(debugfs_lookup(dev_name(m->parent), component_debugfs_dir)); + debugfs_lookup_and_remove(dev_name(m->parent), component_debugfs_dir); } #else -- 2.39.2