[PATCH v2 10/27] selftests/landlock: Assert audit initialization in fixture setups
From: Günther Noack
Date: Wed Nov 04 2026 - 16:57:00 EST
The audit fixtures check the result of audit_init_with_exe_filter() and
audit_init() with EXPECT_LE() and continue with a negative audit FD
when the initialization fails, e.g. when auditd holds the audit socket.
Every following audit check then fails with a less useful message.
Use ASSERT_*() for the audit FD and for the audit_exec filter
initialization, whose result is used by the following calls.
Signed-off-by: Günther Noack <gnoack3000@xxxxxxxxx>
---
tools/testing/selftests/landlock/audit_test.c | 8 ++++----
tools/testing/selftests/landlock/cap_test.c | 2 +-
tools/testing/selftests/landlock/fs_test.c | 6 +++---
tools/testing/selftests/landlock/net_test.c | 2 +-
tools/testing/selftests/landlock/ns_test.c | 4 ++--
tools/testing/selftests/landlock/ptrace_test.c | 2 +-
tools/testing/selftests/landlock/scoped_abstract_unix_test.c | 2 +-
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/tools/testing/selftests/landlock/audit_test.c b/tools/testing/selftests/landlock/audit_test.c
index 81cb31aa32ad..63b1b2a04eee 100644
--- a/tools/testing/selftests/landlock/audit_test.c
+++ b/tools/testing/selftests/landlock/audit_test.c
@@ -49,7 +49,7 @@ FIXTURE_SETUP(audit)
disable_caps(_metadata);
set_cap(_metadata, CAP_AUDIT_CONTROL);
self->audit_fd = audit_init_with_exe_filter(&self->audit_filter);
- EXPECT_LE(0, self->audit_fd)
+ ASSERT_LE(0, self->audit_fd)
{
const char *error_msg;
@@ -652,7 +652,7 @@ FIXTURE_SETUP(audit_flags)
disable_caps(_metadata);
set_cap(_metadata, CAP_AUDIT_CONTROL);
self->audit_fd = audit_init_with_exe_filter(&self->audit_filter);
- EXPECT_LE(0, self->audit_fd)
+ ASSERT_LE(0, self->audit_fd)
{
const char *error_msg;
@@ -841,7 +841,7 @@ FIXTURE_SETUP(audit_exec)
set_cap(_metadata, CAP_AUDIT_CONTROL);
self->audit_fd = audit_init();
- EXPECT_LE(0, self->audit_fd)
+ ASSERT_LE(0, self->audit_fd)
{
const char *error_msg;
@@ -854,7 +854,7 @@ FIXTURE_SETUP(audit_exec)
}
/* Applies test filter for the bin_wait_pipe_sandbox program. */
- EXPECT_EQ(0, audit_init_filter_exe(&self->audit_filter,
+ ASSERT_EQ(0, audit_init_filter_exe(&self->audit_filter,
bin_wait_pipe_sandbox));
EXPECT_EQ(0, audit_filter_exe(self->audit_fd, &self->audit_filter,
AUDIT_ADD_RULE));
diff --git a/tools/testing/selftests/landlock/cap_test.c b/tools/testing/selftests/landlock/cap_test.c
index 3d7fd02e21ed..7b3b724e4406 100644
--- a/tools/testing/selftests/landlock/cap_test.c
+++ b/tools/testing/selftests/landlock/cap_test.c
@@ -775,7 +775,7 @@ FIXTURE_SETUP(cap_audit)
set_cap(_metadata, CAP_AUDIT_CONTROL);
self->audit_fd = audit_init_with_exe_filter(&self->audit_filter);
- EXPECT_LE(0, self->audit_fd);
+ ASSERT_LE(0, self->audit_fd);
clear_cap(_metadata, CAP_AUDIT_CONTROL);
}
diff --git a/tools/testing/selftests/landlock/fs_test.c b/tools/testing/selftests/landlock/fs_test.c
index 7d399c097c93..7ff94755b029 100644
--- a/tools/testing/selftests/landlock/fs_test.c
+++ b/tools/testing/selftests/landlock/fs_test.c
@@ -7504,7 +7504,7 @@ FIXTURE_SETUP(audit_layout1)
set_cap(_metadata, CAP_AUDIT_CONTROL);
self->audit_fd = audit_init_with_exe_filter(&self->audit_filter);
- EXPECT_LE(0, self->audit_fd);
+ ASSERT_LE(0, self->audit_fd);
disable_caps(_metadata);
}
@@ -8028,7 +8028,7 @@ FIXTURE_SETUP(audit_quiet_layout1)
set_cap(_metadata, CAP_AUDIT_CONTROL);
self->audit_fd = audit_init_with_exe_filter(&self->audit_filter);
- EXPECT_LE(0, self->audit_fd);
+ ASSERT_LE(0, self->audit_fd);
clear_cap(_metadata, CAP_AUDIT_CONTROL);
if (getenv("DEBUG_QUIET_TESTS"))
@@ -9605,7 +9605,7 @@ FIXTURE_SETUP(audit_quiet_rename)
set_cap(_metadata, CAP_AUDIT_CONTROL);
self->audit_fd = audit_init_with_exe_filter(&self->audit_filter);
- EXPECT_LE(0, self->audit_fd);
+ ASSERT_LE(0, self->audit_fd);
clear_cap(_metadata, CAP_AUDIT_CONTROL);
if (getenv("DEBUG_QUIET_TESTS"))
diff --git a/tools/testing/selftests/landlock/net_test.c b/tools/testing/selftests/landlock/net_test.c
index 50b637354b51..c1b6e288c965 100644
--- a/tools/testing/selftests/landlock/net_test.c
+++ b/tools/testing/selftests/landlock/net_test.c
@@ -2957,7 +2957,7 @@ FIXTURE_SETUP(audit)
set_cap(_metadata, CAP_AUDIT_CONTROL);
self->audit_fd = audit_init_with_exe_filter(&self->audit_filter);
- EXPECT_LE(0, self->audit_fd);
+ ASSERT_LE(0, self->audit_fd);
disable_caps(_metadata);
};
diff --git a/tools/testing/selftests/landlock/ns_test.c b/tools/testing/selftests/landlock/ns_test.c
index f5d4b86edd30..6491b53742f1 100644
--- a/tools/testing/selftests/landlock/ns_test.c
+++ b/tools/testing/selftests/landlock/ns_test.c
@@ -1944,7 +1944,7 @@ FIXTURE_SETUP(ns_audit)
set_cap(_metadata, CAP_AUDIT_CONTROL);
self->audit_fd = audit_init_with_exe_filter(&self->audit_filter);
- EXPECT_LE(0, self->audit_fd);
+ ASSERT_LE(0, self->audit_fd);
clear_cap(_metadata, CAP_AUDIT_CONTROL);
}
@@ -2596,7 +2596,7 @@ FIXTURE_SETUP(ns_proc_open)
set_cap(_metadata, CAP_AUDIT_CONTROL);
self->audit_fd = audit_init_with_exe_filter(&self->audit_filter);
- EXPECT_LE(0, self->audit_fd);
+ ASSERT_LE(0, self->audit_fd);
clear_cap(_metadata, CAP_AUDIT_CONTROL);
}
diff --git a/tools/testing/selftests/landlock/ptrace_test.c b/tools/testing/selftests/landlock/ptrace_test.c
index e0e7f95e889b..10371c1830ad 100644
--- a/tools/testing/selftests/landlock/ptrace_test.c
+++ b/tools/testing/selftests/landlock/ptrace_test.c
@@ -323,7 +323,7 @@ FIXTURE_SETUP(audit)
disable_caps(_metadata);
set_cap(_metadata, CAP_AUDIT_CONTROL);
self->audit_fd = audit_init_with_exe_filter(&self->audit_filter);
- EXPECT_LE(0, self->audit_fd);
+ ASSERT_LE(0, self->audit_fd);
clear_cap(_metadata, CAP_AUDIT_CONTROL);
}
diff --git a/tools/testing/selftests/landlock/scoped_abstract_unix_test.c b/tools/testing/selftests/landlock/scoped_abstract_unix_test.c
index e006dba61652..5e8224623780 100644
--- a/tools/testing/selftests/landlock/scoped_abstract_unix_test.c
+++ b/tools/testing/selftests/landlock/scoped_abstract_unix_test.c
@@ -288,7 +288,7 @@ FIXTURE_SETUP(scoped_audit)
set_cap(_metadata, CAP_AUDIT_CONTROL);
self->audit_fd = audit_init_with_exe_filter(&self->audit_filter);
- EXPECT_LE(0, self->audit_fd);
+ ASSERT_LE(0, self->audit_fd);
drop_caps(_metadata);
}
--
2.56.0