From 4e5beda9b421771df893fe97cb3dd89efe643b63 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 4 May 2026 15:49:12 +0200 Subject: [PATCH] drop queue-7.0/selftests-landlock-fix-socket-file-descriptor-leaks-in-audit-helpers.patch does not apply. --- ...le-descriptor-leaks-in-audit-helpers.patch | 100 ------------------ queue-7.0/series | 1 - 2 files changed, 101 deletions(-) delete mode 100644 queue-7.0/selftests-landlock-fix-socket-file-descriptor-leaks-in-audit-helpers.patch 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 index dc8dae3b32..0000000000 --- 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 -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" , "Günther Noack" , "Günther Noack" , "Sasha Levin" -Message-ID: <20260502122702.517486-1-sashal@kernel.org> - -From: Mickaël Salaün - -[ 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 -Cc: stable@vger.kernel.org -Fixes: 6a500b22971c ("selftests/landlock: Add tests for audit flags and domain IDs") -Reviewed-by: Günther Noack -Link: https://lore.kernel.org/r/20260402192608.1458252-3-mic@digikod.net -Signed-off-by: Mickaël Salaün -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - 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 32da0682fa..0d03f0fe71 100644 --- 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 -- 2.47.3