landlock: Log the TGID of the domain creator
Subsystems (3)
Mickaël Salaün
maintainerPATCH 1/3 landlock: Log the TGID of the domain creator
As for other Audit's "pid" fields, Landlock should use the task's TGID instead of its TID. Fix this issue by keeping a reference to the TGID of the domain creator.
Existing tests already check for the PID but only with the thread group leader, so always the TGID. A following patch adds dedicated tests for non-leader thread.
Remove the current_real_cred() check which does not make sense because we only reference a struct pid, whereas a previous version did reference a struct cred instead.
--- security/landlock/domain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
security/landlock/domain.c +2 -2
@@ -16,6 +16,7 @@#include <linux/path.h> #include <linux/pid.h> #include <linux/sched.h> +#include <linux/signal.h> #include <linux/uidgid.h> #include "access.h"
@@ -99,8 +100,7 @@ static struct landlock_details *get_current_details(void)return ERR_PTR (-ENOMEM );memcpy (details->exe_path, path_str, path_size); -WARN_ON_ONCE (current_cred () !=current_real_cred ()); - details->pid =get_pid (task_pid (current)); + details->pid =get_pid (task_tgid (current)); details->uid =from_kuid (&init_user_ns,current_uid ());get_task_comm (details->comm, current);return details;
Signature · 1 line
2.49.0
Mickaël Salaün
maintainerPATCH 2/3 selftests/landlock: Factor out audit fixture in audit_test
The audit fixture needlessly stores and manages domain_stack. Move it to the audit.layers tests. This will be useful to reuse the audit fixture with the next patch.
--- tools/testing/selftests/landlock/audit_test.c | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-)
tools/testing/selftests/landlock/audit_test.c +12 -15
@@ -40,7 +40,6 @@ FIXTURE(audit) {struct audit_filter audit_filter;int audit_fd; -__u64 (*domain_stack)[16 ]; };FIXTURE_SETUP (audit)
@@ -60,18 +59,10 @@ FIXTURE_SETUP(audit)TH_LOG ("Failed to initialize audit: %s" , error_msg); }clear_cap (_metadata,CAP_AUDIT_CONTROL ); - - self->domain_stack =mmap (NULL ,sizeof (*self->domain_stack), -PROT_READ |PROT_WRITE , -MAP_SHARED |MAP_ANONYMOUS ,-1 ,0 ); -ASSERT_NE (MAP_FAILED , self->domain_stack); -memset (self->domain_stack,0 ,sizeof (*self->domain_stack)); }FIXTURE_TEARDOWN (audit) { -EXPECT_EQ (0 ,munmap (self->domain_stack,sizeof (*self->domain_stack))); -set_cap (_metadata,CAP_AUDIT_CONTROL );EXPECT_EQ (0 ,audit_cleanup (self->audit_fd, &self->audit_filter));clear_cap (_metadata,CAP_AUDIT_CONTROL );
@@ -83,9 +74,15 @@ TEST_F(audit, layers) .scoped = LANDLOCK_SCOPE_SIGNAL, };int status, ruleset_fd, i; +__u64 (*domain_stack)[16 ];__u64 prev_dom =3 ;pid_t child; + domain_stack =mmap (NULL ,sizeof (*domain_stack),PROT_READ |PROT_WRITE , +MAP_SHARED |MAP_ANONYMOUS ,-1 ,0 ); +ASSERT_NE (MAP_FAILED , domain_stack); +memset (domain_stack,0 ,sizeof (*domain_stack)); + ruleset_fd =landlock_create_ruleset (&ruleset_attr,sizeof (ruleset_attr),0 );ASSERT_LE (0 , ruleset_fd);
@@ -94,7 +91,7 @@ TEST_F(audit, layers) child =fork ();ASSERT_LE (0 , child);if (child ==0 ) { -for (i =0 ; i <ARRAY_SIZE (*self->domain_stack); i++) { +for (i =0 ; i <ARRAY_SIZE (*domain_stack); i++) {__u64 denial_dom =1 ;__u64 allocated_dom =2 ;
@@ -115,7 +112,7 @@ TEST_F(audit, layers)/* Checks that the new domain is younger than the previous one. */ EXPECT_GT (allocated_dom, prev_dom); prev_dom = allocated_dom; - (*self->domain_stack)[i] = allocated_dom; + (*domain_stack)[i] = allocated_dom; }/* Checks that we reached the maximum number of layers. */
@@ -142,20 +139,20 @@ TEST_F(audit, layers)/* Purges log from deallocated domains. */ EXPECT_EQ (0 ,setsockopt (self->audit_fd,SOL_SOCKET ,SO_RCVTIMEO , &audit_tv_dom_drop,sizeof (audit_tv_dom_drop))); -for (i =ARRAY_SIZE (*self->domain_stack) -1 ; i >=0 ; i--) { +for (i =ARRAY_SIZE (*domain_stack) -1 ; i >=0 ; i--) {__u64 deallocated_dom =2 ;EXPECT_EQ (0 ,matches_log_domain_deallocated (self->audit_fd,1 , &deallocated_dom)); - EXPECT_EQ((*self->domain_stack)[i], deallocated_dom) + EXPECT_EQ((*domain_stack)[i], deallocated_dom) {TH_LOG ("Failed to match domain %llx (#%d)" , - (*self->domain_stack)[i], i); + (*domain_stack)[i], i); } } +EXPECT_EQ (0 ,munmap (domain_stack,sizeof (*domain_stack)));EXPECT_EQ (0 ,setsockopt (self->audit_fd,SOL_SOCKET ,SO_RCVTIMEO , &audit_tv_default,sizeof (audit_tv_default))); -EXPECT_EQ (0 ,close (ruleset_fd)); }
Signature · 1 line
2.49.0
Mickaël Salaün
maintainerPATCH 3/3 selftests/landlock: Add PID tests for audit records
In reply to Mickaël SalaünAdd audit.thread tests to check that the PID tied to a domain is not a thread ID but the thread group ID. These new tests would not pass without the previous TGID fix.
Extend matches_log_domain_allocated() to check against the PID that created the domain.
Test coverage for security/landlock is 93.6% of 1524 lines according to gcc/gcov-14.
--- tools/testing/selftests/landlock/audit.h | 21 ++- tools/testing/selftests/landlock/audit_test.c | 127 +++++++++++++++++- tools/testing/selftests/landlock/fs_test.c | 3 +- 3 files changed, 141 insertions(+), 10 deletions(-)
tools/testing/selftests/landlock/audit.h +14 -7
@@ -300,15 +300,22 @@ static int audit_match_record(int audit_fd, const __u16 type,return err; } -static int __maybe_unused matches_log_domain_allocated (int audit_fd, +static int __maybe_unused matches_log_domain_allocated (int audit_fd,pid_t pid,__u64 *domain_id) { -return audit_match_record ( - audit_fd,AUDIT_LANDLOCK_DOMAIN , -REGEX_LANDLOCK_PREFIX -" status=allocated mode=enforcing pid=[0-9]\\+ uid=[0-9]\\+" -" exe=\"[^\"]\\+\" comm=\".*_test\"$" , - domain_id); +static const char log_template[] =REGEX_LANDLOCK_PREFIX +" status=allocated mode=enforcing pid=%d uid=[0-9]\\+" +" exe=\"[^\"]\\+\" comm=\".*_test\"$" ; +char log_match[sizeof (log_template) +10 ]; +int log_match_len; + + log_match_len = +snprintf (log_match,sizeof (log_match), log_template, pid); +if (log_match_len >sizeof (log_match)) +return -E2BIG ; + +return audit_match_record (audit_fd,AUDIT_LANDLOCK_DOMAIN , log_match, + domain_id); } static int __maybe_unused matches_log_domain_deallocated(
tools/testing/selftests/landlock/audit_test.c +125 -2
151 lines not on this page · raw message
tools/testing/selftests/landlock/fs_test.c +2 -1
@@ -5964,7 +5964,8 @@ TEST_F(audit_layout1, refer_handled)EXPECT_EQ (EXDEV , errno);EXPECT_EQ (0 ,matches_log_fs (_metadata, self->audit_fd,"fs\\.refer" , dir_s1d1)); -EXPECT_EQ (0 ,matches_log_domain_allocated (self->audit_fd,NULL )); +EXPECT_EQ (0 , +matches_log_domain_allocated (self->audit_fd,getpid (),NULL ));EXPECT_EQ (0 ,matches_log_fs (_metadata, self->audit_fd,"fs\\.refer" , dir_s1d3));
Signature · 1 line
2.49.0
Quoted 45 lines · Mickaël Salaün
As for other Audit's "pid" fields, Landlock should use the task's TGID instead of its TID. Fix this issue by keeping a reference to the TGID of the domain creator.
Existing tests already check for the PID but only with the thread group leader, so always the TGID. A following patch adds dedicated tests for non-leader thread.
Remove the
current_real_cred()check which does not make sense because we only reference a struct pid, whereas a previous version did reference a struct cred instead.Cc Christian Brauner <[email protected]>Cc Günther Noack <[email protected]>Cc Paul Moore <[email protected]>Signed-off-by Mickaël Salaün <[email protected]>--- security/landlock/domain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)security/landlock/domain.c +2
-2@@ -16,6 +16,7 @@#include <linux/path.h> #include <linux/pid.h> #include <linux/sched.h> +#include <linux/signal.h> #include <linux/uidgid.h> #include "access.h" @@ -99,8 +100,7 @@ static struct landlock_details *get_current_details(void)return ERR_PTR (-ENOMEM );memcpy (details->exe_path, path_str, path_size); -WARN_ON_ONCE (current_cred () !=current_real_cred ()); - details->pid =get_pid (task_pid (current)); + details->pid =get_pid (task_tgid (current)); details->uid =from_kuid (&init_user_ns,current_uid ());get_task_comm (details->comm, current);return details;Signature · 1 line
2.49.0
Ah, a classic! Good catch finding this early enough for 6.15!