FAILED: patch "[PATCH] selftests/landlock: Fix socket file descriptor leaks in audit" failed to apply to 7.0-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 7.0-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-7.0.y
git checkout FETCH_HEAD
git cherry-pick -x 9143d790337a0d066c2d632c802f69b981e6c23a
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026050112-flakily-uncaring-f2c8@gregkh' --subject-prefix 'PATCH 7.0.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 9143d790337a0d066c2d632c802f69b981e6c23a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Sala=C3=BCn?= <[email protected]>
Date: Thu, 2 Apr 2026 21:26:03 +0200
Subject: [PATCH] selftests/landlock: Fix socket file descriptor leaks in audit
helpers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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().
tools/testing/selftests/landlock/audit.h +19 -7
@@ -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; }
Sasha Levin
maintainerPATCH 1/1 selftests/landlock: Fix socket file descriptor leaks in audit helpers
From: Mickaël Salaün <[email protected]>
[ 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().
--- tools/testing/selftests/landlock/audit.h | 26 +++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-)
tools/testing/selftests/landlock/audit.h +19 -7
@@ -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; }
Signature · 1 line
2.53.0
Re: [PATCH 7.0.y] selftests/landlock: Fix socket file descriptor leaks in audit helpers
Quoted 92 lines · Sasha Levin
From: Mickaël Salaün <[email protected]>
[ Upstream commit
9143d790337a0d066c2d632c802f69b981e6c23a]
audit_init()opens a netlink socket and configures it, but leaks the file descriptor ifaudit_set_status()orsetsockopt()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 fromaudit_init()ifaudit_init_filter_exe()oraudit_filter_exe()fails, and toaudit_cleanup(), which leaks it ifaudit_init_filter_exe()fails inFIXTURE_TEARDOWN_PARENT().Cc Günther Noack <[email protected]>Fixes 6a500b22971c ("selftests/landlock: Add tests for audit flags and domain IDs")Reviewed-by Günther Noack <[email protected]>Signed-off-by Mickaël Salaün <[email protected]>Signed-off-by Sasha Levin <[email protected]>--- tools/testing/selftests/landlock/audit.h | 26 +++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-)tools/testing/selftests/landlock/audit.h +19
-7@@ -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; }Signature · 1 line
2.53.0
Does not apply to the tree :(