drop kernfs patches from all queues

diff --git a/queue-6.12/kernfs-fix-memory-leak-of-kernfs_iattrs-in-__kernfs_.patch b/queue-6.12/kernfs-fix-memory-leak-of-kernfs_iattrs-in-__kernfs_.patch
deleted file mode 100644 (file)
index cf30170..0000000
--- a/queue-6.12/kernfs-fix-memory-leak-of-kernfs_iattrs-in-__kernfs_.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From a399529455acdad81730b0e46b291dcaa04363cd Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 25 Nov 2025 08:13:32 -0700
-Subject: kernfs: fix memory leak of kernfs_iattrs in __kernfs_new_node
-
-From: Will Rosenberg <whrosenb@asu.edu>
-
-[ Upstream commit 382b1e8f30f779af8d6d33268e53df7de579ef3c ]
-
-There exists a memory leak of kernfs_iattrs contained as an element
-of kernfs_node allocated in __kernfs_new_node(). __kernfs_setattr()
-allocates kernfs_iattrs as a sub-object, and the LSM security check
-incorrectly errors out and does not free the kernfs_iattrs sub-object.
-
-Make an additional error out case that properly frees kernfs_iattrs if
-security_kernfs_init_security() fails.
-
-Fixes: e19dfdc83b60 ("kernfs: initialize security of newly created nodes")
-Co-developed-by: Oliver Rosenberg <olrose55@gmail.com>
-Signed-off-by: Oliver Rosenberg <olrose55@gmail.com>
-Signed-off-by: Will Rosenberg <whrosenb@asu.edu>
-Link: https://patch.msgid.link/20251125151332.2010687-1-whrosenb@asu.edu
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- fs/kernfs/dir.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
-index 5dc90a498e75d..116ada5bc27c7 100644
---- a/fs/kernfs/dir.c
-+++ b/fs/kernfs/dir.c
-@@ -662,11 +662,14 @@ static struct kernfs_node *__kernfs_new_node(struct kernfs_root *root,
-       if (parent) {
-               ret = security_kernfs_init_security(parent, kn);
-               if (ret)
--                      goto err_out3;
-+                      goto err_out4;
-       }
- 
-       return kn;
- 
-+ err_out4:
-+      simple_xattrs_free(&kn->iattr->xattrs, NULL);
-+      kmem_cache_free(kernfs_iattrs_cache, kn->iattr);
-  err_out3:
-       spin_lock(&kernfs_idr_lock);
-       idr_remove(&root->ino_idr, (u32)kernfs_ino(kn));
--- 
-2.51.0
-

diff --git a/queue-6.12/series b/queue-6.12/series
index ae852468be6cd05cfab805e2d8626165c30e44be..b16ba9b279dbafe16a7392b51ab9de5ee03ac012 100644 (file)
--- a/queue-6.12/series
+++ b/queue-6.12/series
@@ -237,7 +237,6 @@ gfs2-prevent-recursive-memory-reclaim.patch
 asoc-fsl_xcvr-clear-the-channel-status-control-memor.patch
 firmware_loader-make-rust_fw_loader_abstractions-sel.patch
 greybus-gb-beagleplay-fix-timeout-handling-in-bootlo.patch
-kernfs-fix-memory-leak-of-kernfs_iattrs-in-__kernfs_.patch
 drm-amd-display-fix-logical-vs-bitwise-bug-in-get_em.patch
 hwmon-sy7636a-fix-regulator_enable-resource-leak-on-.patch
 acpi-processor_core-fix-map_x2apic_id-for-amd-pstate.patch

diff --git a/queue-6.17/kernfs-fix-memory-leak-of-kernfs_iattrs-in-__kernfs_.patch b/queue-6.17/kernfs-fix-memory-leak-of-kernfs_iattrs-in-__kernfs_.patch
deleted file mode 100644 (file)
index cdcc8e5..0000000
--- a/queue-6.17/kernfs-fix-memory-leak-of-kernfs_iattrs-in-__kernfs_.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 0d92a00174ada3a0fd92abde81c158e28b7355e8 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 25 Nov 2025 08:13:32 -0700
-Subject: kernfs: fix memory leak of kernfs_iattrs in __kernfs_new_node
-
-From: Will Rosenberg <whrosenb@asu.edu>
-
-[ Upstream commit 382b1e8f30f779af8d6d33268e53df7de579ef3c ]
-
-There exists a memory leak of kernfs_iattrs contained as an element
-of kernfs_node allocated in __kernfs_new_node(). __kernfs_setattr()
-allocates kernfs_iattrs as a sub-object, and the LSM security check
-incorrectly errors out and does not free the kernfs_iattrs sub-object.
-
-Make an additional error out case that properly frees kernfs_iattrs if
-security_kernfs_init_security() fails.
-
-Fixes: e19dfdc83b60 ("kernfs: initialize security of newly created nodes")
-Co-developed-by: Oliver Rosenberg <olrose55@gmail.com>
-Signed-off-by: Oliver Rosenberg <olrose55@gmail.com>
-Signed-off-by: Will Rosenberg <whrosenb@asu.edu>
-Link: https://patch.msgid.link/20251125151332.2010687-1-whrosenb@asu.edu
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- fs/kernfs/dir.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
-index a670ba3e565e0..5c0efd6b239f6 100644
---- a/fs/kernfs/dir.c
-+++ b/fs/kernfs/dir.c
-@@ -675,11 +675,14 @@ static struct kernfs_node *__kernfs_new_node(struct kernfs_root *root,
-       if (parent) {
-               ret = security_kernfs_init_security(parent, kn);
-               if (ret)
--                      goto err_out3;
-+                      goto err_out4;
-       }
- 
-       return kn;
- 
-+ err_out4:
-+      simple_xattrs_free(&kn->iattr->xattrs, NULL);
-+      kmem_cache_free(kernfs_iattrs_cache, kn->iattr);
-  err_out3:
-       spin_lock(&root->kernfs_idr_lock);
-       idr_remove(&root->ino_idr, (u32)kernfs_ino(kn));
--- 
-2.51.0
-

diff --git a/queue-6.17/series b/queue-6.17/series
index d2a0eaec8a88ec310d7977e2a35428d9bc1cac68..7b202c7fc45fec3592dad19e36ad5d6ca9db8835 100644 (file)
--- a/queue-6.17/series
+++ b/queue-6.17/series
@@ -363,7 +363,6 @@ asoc-fsl_xcvr-clear-the-channel-status-control-memor.patch
 firmware_loader-make-rust_fw_loader_abstractions-sel.patch
 greybus-gb-beagleplay-fix-timeout-handling-in-bootlo.patch
 misc-rp1-fix-an-error-handling-path-in-rp1_probe.patch
-kernfs-fix-memory-leak-of-kernfs_iattrs-in-__kernfs_.patch
 drm-amd-display-fix-logical-vs-bitwise-bug-in-get_em.patch
 hwmon-sy7636a-fix-regulator_enable-resource-leak-on-.patch
 acpi-processor_core-fix-map_x2apic_id-for-amd-pstate.patch

diff --git a/queue-6.18/kernfs-fix-memory-leak-of-kernfs_iattrs-in-__kernfs_.patch b/queue-6.18/kernfs-fix-memory-leak-of-kernfs_iattrs-in-__kernfs_.patch
deleted file mode 100644 (file)
index ee1313e..0000000
--- a/queue-6.18/kernfs-fix-memory-leak-of-kernfs_iattrs-in-__kernfs_.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 047ffe930df80627c714c931ea59c42aad8a37c7 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 25 Nov 2025 08:13:32 -0700
-Subject: kernfs: fix memory leak of kernfs_iattrs in __kernfs_new_node
-
-From: Will Rosenberg <whrosenb@asu.edu>
-
-[ Upstream commit 382b1e8f30f779af8d6d33268e53df7de579ef3c ]
-
-There exists a memory leak of kernfs_iattrs contained as an element
-of kernfs_node allocated in __kernfs_new_node(). __kernfs_setattr()
-allocates kernfs_iattrs as a sub-object, and the LSM security check
-incorrectly errors out and does not free the kernfs_iattrs sub-object.
-
-Make an additional error out case that properly frees kernfs_iattrs if
-security_kernfs_init_security() fails.
-
-Fixes: e19dfdc83b60 ("kernfs: initialize security of newly created nodes")
-Co-developed-by: Oliver Rosenberg <olrose55@gmail.com>
-Signed-off-by: Oliver Rosenberg <olrose55@gmail.com>
-Signed-off-by: Will Rosenberg <whrosenb@asu.edu>
-Link: https://patch.msgid.link/20251125151332.2010687-1-whrosenb@asu.edu
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- fs/kernfs/dir.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
-index a670ba3e565e0..5c0efd6b239f6 100644
---- a/fs/kernfs/dir.c
-+++ b/fs/kernfs/dir.c
-@@ -675,11 +675,14 @@ static struct kernfs_node *__kernfs_new_node(struct kernfs_root *root,
-       if (parent) {
-               ret = security_kernfs_init_security(parent, kn);
-               if (ret)
--                      goto err_out3;
-+                      goto err_out4;
-       }
- 
-       return kn;
- 
-+ err_out4:
-+      simple_xattrs_free(&kn->iattr->xattrs, NULL);
-+      kmem_cache_free(kernfs_iattrs_cache, kn->iattr);
-  err_out3:
-       spin_lock(&root->kernfs_idr_lock);
-       idr_remove(&root->ino_idr, (u32)kernfs_ino(kn));
--- 
-2.51.0
-

diff --git a/queue-6.18/series b/queue-6.18/series
index 0e43f13aa0cb2ac07c1d5a30c1f04e7155503991..0607a32e2dde57d8cca824938e4fd76cac4abd72 100644 (file)
--- a/queue-6.18/series
+++ b/queue-6.18/series
@@ -444,7 +444,6 @@ greybus-gb-beagleplay-fix-timeout-handling-in-bootlo.patch
 fs-refactor-file-timestamp-update-logic.patch
 fs-lift-the-fmode_nocmtime-check-into-file_update_ti.patch
 misc-rp1-fix-an-error-handling-path-in-rp1_probe.patch
-kernfs-fix-memory-leak-of-kernfs_iattrs-in-__kernfs_.patch
 drm-amd-display-fix-logical-vs-bitwise-bug-in-get_em.patch
 drm-amdkfd-assign-aid-to-uuid-in-topology-for-spx-mo.patch
 hwmon-sy7636a-fix-regulator_enable-resource-leak-on-.patch

diff --git a/queue-6.6/kernfs-fix-memory-leak-of-kernfs_iattrs-in-__kernfs_.patch b/queue-6.6/kernfs-fix-memory-leak-of-kernfs_iattrs-in-__kernfs_.patch
deleted file mode 100644 (file)
index 8437bea..0000000
--- a/queue-6.6/kernfs-fix-memory-leak-of-kernfs_iattrs-in-__kernfs_.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From e67cd8ba535060cc62b94e9a2d5f7f067e9a57af Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 25 Nov 2025 08:13:32 -0700
-Subject: kernfs: fix memory leak of kernfs_iattrs in __kernfs_new_node
-
-From: Will Rosenberg <whrosenb@asu.edu>
-
-[ Upstream commit 382b1e8f30f779af8d6d33268e53df7de579ef3c ]
-
-There exists a memory leak of kernfs_iattrs contained as an element
-of kernfs_node allocated in __kernfs_new_node(). __kernfs_setattr()
-allocates kernfs_iattrs as a sub-object, and the LSM security check
-incorrectly errors out and does not free the kernfs_iattrs sub-object.
-
-Make an additional error out case that properly frees kernfs_iattrs if
-security_kernfs_init_security() fails.
-
-Fixes: e19dfdc83b60 ("kernfs: initialize security of newly created nodes")
-Co-developed-by: Oliver Rosenberg <olrose55@gmail.com>
-Signed-off-by: Oliver Rosenberg <olrose55@gmail.com>
-Signed-off-by: Will Rosenberg <whrosenb@asu.edu>
-Link: https://patch.msgid.link/20251125151332.2010687-1-whrosenb@asu.edu
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- fs/kernfs/dir.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
-index f6e2a4523f7e6..cbbf28334db4e 100644
---- a/fs/kernfs/dir.c
-+++ b/fs/kernfs/dir.c
-@@ -662,11 +662,14 @@ static struct kernfs_node *__kernfs_new_node(struct kernfs_root *root,
-       if (parent) {
-               ret = security_kernfs_init_security(parent, kn);
-               if (ret)
--                      goto err_out3;
-+                      goto err_out4;
-       }
- 
-       return kn;
- 
-+ err_out4:
-+      simple_xattrs_free(&kn->iattr->xattrs, NULL);
-+      kmem_cache_free(kernfs_iattrs_cache, kn->iattr);
-  err_out3:
-       spin_lock(&kernfs_idr_lock);
-       idr_remove(&root->ino_idr, (u32)kernfs_ino(kn));
--- 
-2.51.0
-

diff --git a/queue-6.6/series b/queue-6.6/series
index dc3ca639a0e05829349d674e80333393405d3e67..6e32d8f2e1a2e693f3420e8471fc1a874896f0fb 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -214,7 +214,6 @@ rdma-irdma-fix-data-race-in-irdma_free_pble.patch
 rdma-irdma-add-support-to-re-register-a-memory-regio.patch
 rdma-irdma-do-not-directly-rely-on-ib_pd_unsafe_glob.patch
 asoc-fsl_xcvr-clear-the-channel-status-control-memor.patch
-kernfs-fix-memory-leak-of-kernfs_iattrs-in-__kernfs_.patch
 drm-amd-display-fix-logical-vs-bitwise-bug-in-get_em.patch
 hwmon-sy7636a-fix-regulator_enable-resource-leak-on-.patch
 acpi-processor_core-fix-map_x2apic_id-for-amd-pstate.patch