diff mbox series

Revert "net: mvpp2: debugfs: fix memory leak when using debugfs_lookup()"

Message ID 20220923234736.657413-1-sashal@kernel.org (mailing list archive)
State Accepted
Commit 6052a4c11fd893234e085edf7bf2e00a33a79d4e
Delegated to: Netdev Maintainers
Headers show
Series Revert "net: mvpp2: debugfs: fix memory leak when using debugfs_lookup()" | expand

Checks

Context Check Description
netdev/tree_selection success Guessed tree name to be net-next
netdev/fixes_present success Fixes tag not required for -next series
netdev/subject_prefix warning Target tree name not specified in the subject
netdev/cover_letter success Single patches do not need cover letters
netdev/patch_count success Link
netdev/header_inline success No static functions without inline keyword in header files
netdev/build_32bit success Errors and warnings before: 0 this patch: 0
netdev/cc_maintainers success CCed 8 of 8 maintainers
netdev/build_clang success Errors and warnings before: 0 this patch: 0
netdev/module_param success Was 0 now: 0
netdev/verify_signedoff success Signed-off-by tag matches author and committer
netdev/check_selftest success No net selftest shell script
netdev/verify_fixes success Fixes tag looks correct
netdev/build_allmodconfig_warn success Errors and warnings before: 0 this patch: 0
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 12 lines checked
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/source_inline success Was 0 now: 0

Commit Message

Sasha Levin Sept. 23, 2022, 11:47 p.m. UTC 
This reverts commit fe2c9c61f668cde28dac2b188028c5299cedcc1e.

On Tue, Sep 13, 2022 at 05:48:58PM +0100, Russell King (Oracle) wrote:
>What happens if this is built as a module, and the module is loaded,
>binds (and creates the directory), then is removed, and then re-
>inserted?  Nothing removes the old directory, so doesn't
>debugfs_create_dir() fail, resulting in subsequent failure to add
>any subsequent debugfs entries?
>
>I don't think this patch should be backported to stable trees until
>this point is addressed.

Revert until a proper fix is available as the original behavior was
better.

Cc: Marcin Wojtas <mw@semihalf.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: netdev@vger.kernel.org
Cc: stable@kernel.org
Reported-by: Russell King <linux@armlinux.org.uk>
Fixes: fe2c9c61f668 ("net: mvpp2: debugfs: fix memory leak when using debugfs_lookup()")
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Greg KH Sept. 24, 2022, 12:02 p.m. UTC | #1 
On Fri, Sep 23, 2022 at 07:47:36PM -0400, Sasha Levin wrote:
> This reverts commit fe2c9c61f668cde28dac2b188028c5299cedcc1e.
> 
> On Tue, Sep 13, 2022 at 05:48:58PM +0100, Russell King (Oracle) wrote:
> >What happens if this is built as a module, and the module is loaded,
> >binds (and creates the directory), then is removed, and then re-
> >inserted?  Nothing removes the old directory, so doesn't
> >debugfs_create_dir() fail, resulting in subsequent failure to add
> >any subsequent debugfs entries?
> >
> >I don't think this patch should be backported to stable trees until
> >this point is addressed.
> 
> Revert until a proper fix is available as the original behavior was
> better.
> 
> Cc: Marcin Wojtas <mw@semihalf.com>
> Cc: Russell King <linux@armlinux.org.uk>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Eric Dumazet <edumazet@google.com>
> Cc: Jakub Kicinski <kuba@kernel.org>
> Cc: Paolo Abeni <pabeni@redhat.com>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: netdev@vger.kernel.org
> Cc: stable@kernel.org
> Reported-by: Russell King <linux@armlinux.org.uk>
> Fixes: fe2c9c61f668 ("net: mvpp2: debugfs: fix memory leak when using debugfs_lookup()")
> Signed-off-by: Sasha Levin <sashal@kernel.org>
> ---
>  drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
patchwork-bot+netdevbpf@kernel.org Sept. 26, 2022, 6:10 p.m. UTC | #2 
Hello:

This patch was applied to netdev/net.git (master)
by Jakub Kicinski <kuba@kernel.org>:

On Fri, 23 Sep 2022 19:47:36 -0400 you wrote:
> This reverts commit fe2c9c61f668cde28dac2b188028c5299cedcc1e.
> 
> On Tue, Sep 13, 2022 at 05:48:58PM +0100, Russell King (Oracle) wrote:
> >What happens if this is built as a module, and the module is loaded,
> >binds (and creates the directory), then is removed, and then re-
> >inserted?  Nothing removes the old directory, so doesn't
> >debugfs_create_dir() fail, resulting in subsequent failure to add
> >any subsequent debugfs entries?
> >
> >I don't think this patch should be backported to stable trees until
> >this point is addressed.
> 
> [...]

Here is the summary with links:
  - Revert "net: mvpp2: debugfs: fix memory leak when using debugfs_lookup()"
    https://git.kernel.org/netdev/net/c/6052a4c11fd8

You are awesome, thank you!
diff mbox series

Patch

diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c
index 0eec05d905eb..4a3baa7e0142 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c
@@ -700,10 +700,10 @@  void mvpp2_dbgfs_cleanup(struct mvpp2 *priv)
 
 void mvpp2_dbgfs_init(struct mvpp2 *priv, const char *name)
 {
-	static struct dentry *mvpp2_root;
-	struct dentry *mvpp2_dir;
+	struct dentry *mvpp2_dir, *mvpp2_root;
 	int ret, i;
 
+	mvpp2_root = debugfs_lookup(MVPP2_DRIVER_NAME, NULL);
 	if (!mvpp2_root)
 		mvpp2_root = debugfs_create_dir(MVPP2_DRIVER_NAME, NULL);