From 82e669995f5c62ffe0113fe3c46f1df7424b0302 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 23 Sep 2022 19:14:52 +0200 Subject: [PATCH] drop net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs.patch again. --- ...s-fix-memory-leak-when-using-debugfs.patch | 51 ------------------- queue-5.10/series | 1 - ...s-fix-memory-leak-when-using-debugfs.patch | 51 ------------------- queue-5.15/series | 1 - ...s-fix-memory-leak-when-using-debugfs.patch | 51 ------------------- queue-5.19/series | 1 - 6 files changed, 156 deletions(-) delete mode 100644 queue-5.10/net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs.patch delete mode 100644 queue-5.15/net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs.patch delete mode 100644 queue-5.19/net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs.patch 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 index e89a54708c5..00000000000 --- 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 -Date: Fri, 2 Sep 2022 15:41:11 +0200 -Subject: net: mvpp2: debugfs: fix memory leak when using debugfs_lookup() - -From: Greg Kroah-Hartman - -[ 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 -Cc: Russell King -Cc: "David S. Miller" -Cc: Eric Dumazet -Cc: Jakub Kicinski -Cc: Paolo Abeni -Cc: netdev@vger.kernel.org -Cc: stable -Fixes: 21da57a23125 ("net: mvpp2: add a debugfs interface for the Header Parser") -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin ---- - 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 3817250dea0..4683f840a6b 100644 --- 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 index d85b6a64a5a..00000000000 --- 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 -Date: Fri, 2 Sep 2022 15:41:11 +0200 -Subject: net: mvpp2: debugfs: fix memory leak when using debugfs_lookup() - -From: Greg Kroah-Hartman - -[ 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 -Cc: Russell King -Cc: "David S. Miller" -Cc: Eric Dumazet -Cc: Jakub Kicinski -Cc: Paolo Abeni -Cc: netdev@vger.kernel.org -Cc: stable -Fixes: 21da57a23125 ("net: mvpp2: add a debugfs interface for the Header Parser") -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin ---- - 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 bc33090cb5c..fcf3aa9ff23 100644 --- 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 index 01faa0ef8e1..00000000000 --- 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 -Date: Fri, 2 Sep 2022 15:41:11 +0200 -Subject: net: mvpp2: debugfs: fix memory leak when using debugfs_lookup() - -From: Greg Kroah-Hartman - -[ 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 -Cc: Russell King -Cc: "David S. Miller" -Cc: Eric Dumazet -Cc: Jakub Kicinski -Cc: Paolo Abeni -Cc: netdev@vger.kernel.org -Cc: stable -Fixes: 21da57a23125 ("net: mvpp2: add a debugfs interface for the Header Parser") -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: David S. Miller -Signed-off-by: Sasha Levin ---- - 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 492077e144c..367fc746904 100644 --- 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 -- 2.47.3