drop queue-7.0/selftests-landlock-fix-socket-file-descriptor-leaks-in-audit-helpers...

does not apply.

diff --git a/queue-7.0/selftests-landlock-fix-socket-file-descriptor-leaks-in-audit-helpers.patch b/queue-7.0/selftests-landlock-fix-socket-file-descriptor-leaks-in-audit-helpers.patch
deleted file mode 100644 (file)
index dc8dae3..0000000
--- a/queue-7.0/selftests-landlock-fix-socket-file-descriptor-leaks-in-audit-helpers.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From stable+bounces-242598-greg=kroah.com@vger.kernel.org Sat May  2 14:27:10 2026
-From: Sasha Levin <sashal@kernel.org>
-Date: Sat,  2 May 2026 08:27:02 -0400
-Subject: selftests/landlock: Fix socket file descriptor leaks in audit helpers
-To: stable@vger.kernel.org
-Cc: "Mickaël Salaün" <mic@digikod.net>, "Günther Noack" <gnoack@google.com>, "Günther Noack" <gnoack3000@gmail.com>, "Sasha Levin" <sashal@kernel.org>
-Message-ID: <20260502122702.517486-1-sashal@kernel.org>
-
-From: Mickaël Salaün <mic@digikod.net>
-
-[ Upstream commit 9143d790337a0d066c2d632c802f69b981e6c23a ]
-
-audit_init() opens a netlink socket and configures it, but leaks the
-file descriptor if audit_set_status() or setsockopt() fails.  Fix this
-by jumping to an error path that closes the socket before returning.
-
-Apply the same fix to audit_init_with_exe_filter(), which leaks the file
-descriptor from audit_init() if audit_init_filter_exe() or
-audit_filter_exe() fails, and to audit_cleanup(), which leaks it if
-audit_init_filter_exe() fails in FIXTURE_TEARDOWN_PARENT().
-
-Cc: Günther Noack <gnoack@google.com>
-Cc: stable@vger.kernel.org
-Fixes: 6a500b22971c ("selftests/landlock: Add tests for audit flags and domain IDs")
-Reviewed-by: Günther Noack <gnoack3000@gmail.com>
-Link: https://lore.kernel.org/r/20260402192608.1458252-3-mic@digikod.net
-Signed-off-by: Mickaël Salaün <mic@digikod.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- tools/testing/selftests/landlock/audit.h | 26 +++++++++++++++++-------
- 1 file changed, 19 insertions(+), 7 deletions(-)
-
-diff --git a/tools/testing/selftests/landlock/audit.h b/tools/testing/selftests/landlock/audit.h
-index 44eb433e96661..0007c247cd335 100644
---- a/tools/testing/selftests/landlock/audit.h
-+++ b/tools/testing/selftests/landlock/audit.h
-@@ -379,19 +379,25 @@ static int audit_init(void)
- 
-       err = audit_set_status(fd, AUDIT_STATUS_ENABLED, 1);
-       if (err)
--              return err;
-+              goto err_close;
- 
-       err = audit_set_status(fd, AUDIT_STATUS_PID, getpid());
-       if (err)
--              return err;
-+              goto err_close;
- 
-       /* Sets a timeout for negative tests. */
-       err = setsockopt(fd, SOL_SOCKET, SO_RCVTIMEO, &audit_tv_default,
-                        sizeof(audit_tv_default));
--      if (err)
--              return -errno;
-+      if (err) {
-+              err = -errno;
-+              goto err_close;
-+      }
- 
-       return fd;
-+
-+err_close:
-+      close(fd);
-+      return err;
- }
- 
- static int audit_init_filter_exe(struct audit_filter *filter, const char *path)
-@@ -441,8 +447,10 @@ static int audit_cleanup(int audit_fd, struct audit_filter *filter)
- 
-               filter = &new_filter;
-               err = audit_init_filter_exe(filter, NULL);
--              if (err)
-+              if (err) {
-+                      close(audit_fd);
-                       return err;
-+              }
-       }
- 
-       /* Filters might not be in place. */
-@@ -468,11 +476,15 @@ static int audit_init_with_exe_filter(struct audit_filter *filter)
- 
-       err = audit_init_filter_exe(filter, NULL);
-       if (err)
--              return err;
-+              goto err_close;
- 
-       err = audit_filter_exe(fd, filter, AUDIT_ADD_RULE);
-       if (err)
--              return err;
-+              goto err_close;
- 
-       return fd;
-+
-+err_close:
-+      close(fd);
-+      return err;
- }
--- 
-2.53.0
-

diff --git a/queue-7.0/series b/queue-7.0/series
index 32da0682fa03027e7297f900fac9b8a052b8d23b..0d03f0fe71fffa02e49a0275d71d42af860e1258 100644 (file)
--- a/queue-7.0/series
+++ b/queue-7.0/series
@@ -305,4 +305,3 @@ mm-page_alloc-return-null-early-from-alloc_frozen_pages_nolock-in-nmi-on-up.patc
 mm-slab-return-null-early-from-kmalloc_nolock-in-nmi-on-up.patch
 net-ipv6-fix-noref-dst-use-in-seg6-and-rpl-lwtunnels.patch
 netfilter-reject-zero-shift-in-nft_bitwise.patch
-selftests-landlock-fix-socket-file-descriptor-leaks-in-audit-helpers.patch