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

diff --git a/queue-4.19/net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs.patch b/queue-4.19/net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs.patch
deleted file mode 100644 (file)
index 6c2dd8f..0000000
--- a/queue-4.19/net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 3feb4d894fc97629b74ff051ec35f09cf7ed11eb 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 87d9cbe10cec..a43bfb86f315 100644
---- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c
-+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c
-@@ -655,10 +655,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-4.19/series b/queue-4.19/series
index 359e4b1101cf880f96230b6654ecff836602cc77..c7b9ea7ce2406b604182c28c2c2a53415f02a0c7 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -6,7 +6,6 @@ efi-libstub-disable-shadow-call-stack.patch
 efi-libstub-disable-struct-randomization.patch
 nvmet-fix-a-use-after-free.patch
 mvpp2-no-need-to-check-return-value-of-debugfs_creat.patch
-net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs.patch
 cifs-don-t-send-down-the-destination-address-to-sendmsg-for-a-sock_stream.patch
 asoc-nau8824-fix-semaphore-unbalance-at-error-paths.patch
 regulator-pfuze100-fix-the-global-out-of-bounds-acce.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 (file)
index 01c6863..0000000
--- a/queue-5.10/net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 24f9e4af2b16c42327cde7198834a5d58aacb2f8 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 441dcd7ab6bc00993385124794c2f663c2b07d27..9f4c7fe737c604357dc5148af98388f9446f7f5e 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -35,4 +35,3 @@ afs-return-eagain-not-eremoteio-when-a-file-already-.patch
 mips-octeon-irq-fix-octeon_irq_force_ciu_mapping.patch
 mksysmap-fix-the-mismatch-of-l0-symbols-in-system.ma.patch
 video-fbdev-pxa3xx-gcu-fix-integer-overflow-in-pxa3x.patch
-net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs.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 682bee8..0000000
--- a/queue-5.15/net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 4d5aed8bbf924dcfababa60dd1526354b0940d0f 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 3c9de9b37c100e9b2f2e14415c7369e864d9c870..b98861ffce04c69917d46f350fa71dc396bdf635 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -13,7 +13,6 @@ drm-meson-correct-osd1-global-alpha-value.patch
 drm-meson-fix-osd1-rgb-to-ycbcr-coefficient.patch
 block-blk_queue_enter-__bio_queue_enter-must-return-.patch
 parisc-ccio-dma-add-missing-iounmap-in-error-path-in.patch
-net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs.patch
 of-device-fix-up-of_dma_configure_id-stub.patch
 cifs-revalidate-mapping-when-doing-direct-writes.patch
 cifs-don-t-send-down-the-destination-address-to-sendmsg-for-a-sock_stream.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 33b3275..0000000
--- a/queue-5.19/net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 8a0eb7e3df432d2067f908e01674f2f3cb52a007 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 0a78befec77ff2156cada7d60e829d39622d941e..1d92a21e596810f729f4d313d78aec592d4aadda 100644 (file)
--- a/queue-5.19/series
+++ b/queue-5.19/series
@@ -17,7 +17,6 @@ drm-i915-guc-don-t-update-engine-busyness-stats-too-.patch
 drm-i915-guc-cancel-guc-engine-busyness-worker-synch.patch
 block-blk_queue_enter-__bio_queue_enter-must-return-.patch
 parisc-ccio-dma-add-missing-iounmap-in-error-path-in.patch
-net-mvpp2-debugfs-fix-memory-leak-when-using-debugfs.patch
 of-device-fix-up-of_dma_configure_id-stub.patch
 io_uring-msg_ring-check-file-type-before-putting.patch
 cifs-revalidate-mapping-when-doing-direct-writes.patch