drop net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs.patch again.

diff --git a/queue-5.10/net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs.patch b/queue-5.10/net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs.patch
deleted file mode 100644 (file)
index e89a547..0000000
--- a/queue-5.10/net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 9e6d4bd8d3ed68ca8238c1997360cf273e22c4de Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 2 Sep 2022 15:41:11 +0200
-Subject: net: mvpp2: debugfs: fix memory leak when using debugfs_lookup()
-
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
-[ Upstream commit fe2c9c61f668cde28dac2b188028c5299cedcc1e ]
-
-When calling debugfs_lookup() the result must have dput() called on it,
-otherwise the memory will leak over time.  Fix this up to be much
-simpler logic and only create the root debugfs directory once when the
-driver is first accessed.  That resolves the memory leak and makes
-things more obvious as to what the intent is.
-
-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: netdev@vger.kernel.org
-Cc: stable <stable@kernel.org>
-Fixes: 21da57a23125 ("net: mvpp2: add a debugfs interface for the Header Parser")
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c
-index 4a3baa7e0142..0eec05d905eb 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)
- {
--      struct dentry *mvpp2_dir, *mvpp2_root;
-+      static struct dentry *mvpp2_root;
-+      struct dentry *mvpp2_dir;
-       int ret, i;
- 
--      mvpp2_root = debugfs_lookup(MVPP2_DRIVER_NAME, NULL);
-       if (!mvpp2_root)
-               mvpp2_root = debugfs_create_dir(MVPP2_DRIVER_NAME, NULL);
- 
--- 
-2.35.1
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 3817250dea0d13586ea25b90cd698c9cd3ab771c..4683f840a6b42291d27c5421f9d451063d7b87ff 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -35,6 +35,5 @@ vfio-type1-change-success-value-of-vaddr_get_pfn.patch
 vfio-type1-prepare-for-batched-pinning-with-struct-v.patch
 vfio-type1-unpin-zero-pages.patch
 revert-usb-gadget-udc-xilinx-replace-memcpy-with-mem.patch
-net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs.patch
 arm64-restrict-arm64_bti_kernel-to-clang-12.0.0-and-.patch
 arm64-bti-disable-in-kernel-bti-when-cross-section-t.patch

diff --git a/queue-5.15/net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs.patch b/queue-5.15/net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs.patch
deleted file mode 100644 (file)
index d85b6a6..0000000
--- a/queue-5.15/net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 676abb5e750b97bb96bb428eade0927e86d33761 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 2 Sep 2022 15:41:11 +0200
-Subject: net: mvpp2: debugfs: fix memory leak when using debugfs_lookup()
-
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
-[ Upstream commit fe2c9c61f668cde28dac2b188028c5299cedcc1e ]
-
-When calling debugfs_lookup() the result must have dput() called on it,
-otherwise the memory will leak over time.  Fix this up to be much
-simpler logic and only create the root debugfs directory once when the
-driver is first accessed.  That resolves the memory leak and makes
-things more obvious as to what the intent is.
-
-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: netdev@vger.kernel.org
-Cc: stable <stable@kernel.org>
-Fixes: 21da57a23125 ("net: mvpp2: add a debugfs interface for the Header Parser")
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c
-index 4a3baa7e0142..0eec05d905eb 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)
- {
--      struct dentry *mvpp2_dir, *mvpp2_root;
-+      static struct dentry *mvpp2_root;
-+      struct dentry *mvpp2_dir;
-       int ret, i;
- 
--      mvpp2_root = debugfs_lookup(MVPP2_DRIVER_NAME, NULL);
-       if (!mvpp2_root)
-               mvpp2_root = debugfs_create_dir(MVPP2_DRIVER_NAME, NULL);
- 
--- 
-2.35.1
-

diff --git a/queue-5.15/series b/queue-5.15/series
index bc33090cb5cc954ba18ae84d1f1ba590488442a2..fcf3aa9ff233a2e31f84555a76702875415642ff 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -16,4 +16,3 @@ usb-add-quirks-for-lenovo-onelink-dock.patch
 usb-gadget-udc-xilinx-replace-memcpy-with-memcpy_toi.patch
 revert-usb-add-quirks-for-lenovo-onelink-dock.patch
 revert-usb-gadget-udc-xilinx-replace-memcpy-with-mem.patch
-net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs.patch

diff --git a/queue-5.19/net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs.patch b/queue-5.19/net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs.patch
deleted file mode 100644 (file)
index 01faa0e..0000000
--- a/queue-5.19/net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 8e794602201b071b24a348dce799c504c202a5cc Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 2 Sep 2022 15:41:11 +0200
-Subject: net: mvpp2: debugfs: fix memory leak when using debugfs_lookup()
-
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
-[ Upstream commit fe2c9c61f668cde28dac2b188028c5299cedcc1e ]
-
-When calling debugfs_lookup() the result must have dput() called on it,
-otherwise the memory will leak over time.  Fix this up to be much
-simpler logic and only create the root debugfs directory once when the
-driver is first accessed.  That resolves the memory leak and makes
-things more obvious as to what the intent is.
-
-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: netdev@vger.kernel.org
-Cc: stable <stable@kernel.org>
-Fixes: 21da57a23125 ("net: mvpp2: add a debugfs interface for the Header Parser")
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c
-index 4a3baa7e0142..0eec05d905eb 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)
- {
--      struct dentry *mvpp2_dir, *mvpp2_root;
-+      static struct dentry *mvpp2_root;
-+      struct dentry *mvpp2_dir;
-       int ret, i;
- 
--      mvpp2_root = debugfs_lookup(MVPP2_DRIVER_NAME, NULL);
-       if (!mvpp2_root)
-               mvpp2_root = debugfs_create_dir(MVPP2_DRIVER_NAME, NULL);
- 
--- 
-2.35.1
-

diff --git a/queue-5.19/series b/queue-5.19/series
index 492077e144c0c4cbf74c7a8937cb45049b631c92..367fc746904004325dc570471cd24b5fea046431 100644 (file)
--- a/queue-5.19/series
+++ b/queue-5.19/series
@@ -16,7 +16,6 @@ usb-gadget-udc-xilinx-replace-memcpy-with-memcpy_toi.patch
 smb3-use-filemap_write_and_wait_range-instead-of-fil.patch
 revert-usb-add-quirks-for-lenovo-onelink-dock.patch
 revert-usb-gadget-udc-xilinx-replace-memcpy-with-mem.patch
-net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs.patch
 xfrm-fix-xfrma_lastused-comment.patch
 usb-dwc3-qcom-fix-gadget-only-builds.patch
 usb-dwc3-qcom-fix-runtime-pm-wakeup.patch