Skip to contentSkip to conversation

selftests/landlock: Fix selftest ptrace_test

PATCH Superseded [email protected] 4 participants 9 messages Jan 3, 2023 – Jan 10, 2023

Subsystems (3)

v4 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

v4 cover selftests/landlock: Fix selftest ptrace_test

From: Jeff Xu <[email protected]>

Landlock ptrace failed because YAMA is enabled. This patch check YAMA value and skip related tests.

V4:
- apply can_trace_parent and can_trace_child to smaller scope.

V3:
https://lore.kernel.org/all/[email protected]
- add can_trace_parent and can_trace_child to handle yama value.

V2:
https://lore.kernel.org/all/[email protected]
- update from code review comments.

V1:
https://lore.kernel.org/all/[email protected]
- skip specific testcase according to YAMA value

V0:
https://lore.kernel.org/r/[email protected]
- skip entire ptrace when YAMA is not 0.

Jeff Xu (1):
selftests/landlock: skip ptrace_test according to YAMA

 .../testing/selftests/landlock/ptrace_test.c  | 48 ++++++++++++++++---
 1 file changed, 42 insertions(+), 6 deletions(-)

base-commit: 963a70bee5880640d0fd83ed29dc1e7ec0d2bd4a

Signature · 1 line
2.39.0.314.g84b9a713c41-goog
#1 lore raw

PATCH v4 1/1 selftests/landlock: skip ptrace_test according to YAMA

From: Jeff Xu <[email protected]>

Add check for yama setting for ptrace_test.

---
 .../testing/selftests/landlock/ptrace_test.c  | 48 ++++++++++++++++---
 1 file changed, 42 insertions(+), 6 deletions(-)
tools/testing/selftests/landlock/ptrace_test.c +42 -6
index c28ef98ff3ac..379f5ddf6c3f 100644
@@ -60,6 +60,23 @@ static int test_ptrace_read(const pid_t pid)
 	return 0;
 }
 
+static int get_yama_ptrace_scope(void)
+{
+	int ret = -1;
+	char buf[2] = {};
+	int fd = open("/proc/sys/kernel/yama/ptrace_scope", O_RDONLY);
+
+	if (fd < 0)
+		return 0;
+
+	if (read(fd, &buf, 1) < 0)
+		return -1;
+
+	ret = atoi(buf);
+	close(fd);
+	return ret;
+}
+
 /* clang-format off */
 FIXTURE(hierarchy) {};
 /* clang-format on */
@@ -232,8 +249,20 @@ TEST_F(hierarchy, trace)
 	pid_t child, parent;
 	int status, err_proc_read;
 	int pipe_child[2], pipe_parent[2];
+	int yama_ptrace_scope;
 	char buf_parent;
 	long ret;
+	bool can_trace_child, can_trace_parent;
+
+	yama_ptrace_scope = get_yama_ptrace_scope();
+	ASSERT_LE(0, yama_ptrace_scope);
+
+	if (yama_ptrace_scope >= 3)
+		SKIP(return, "Yama forbids any ptrace use (scope %d)",
+			   yama_ptrace_scope);
+
+	can_trace_child = !variant->domain_parent && (yama_ptrace_scope < 2);
+	can_trace_parent = !variant->domain_child && (yama_ptrace_scope < 1);
 
 	/*
 	 * Removes all effective and permitted capabilities to not interfere
@@ -258,6 +287,7 @@ TEST_F(hierarchy, trace)
 
 		ASSERT_EQ(0, close(pipe_parent[1]));
 		ASSERT_EQ(0, close(pipe_child[0]));
+
 		if (variant->domain_child)
 			create_domain(_metadata);
 
@@ -267,7 +297,7 @@ TEST_F(hierarchy, trace)
 		/* Tests PTRACE_ATTACH and PTRACE_MODE_READ on the parent. */
 		err_proc_read = test_ptrace_read(parent);
 		ret = ptrace(PTRACE_ATTACH, parent, NULL, 0);
-		if (variant->domain_child) {
+		if (!can_trace_parent) {
 			EXPECT_EQ(-1, ret);
 			EXPECT_EQ(EPERM, errno);
 			EXPECT_EQ(EACCES, err_proc_read);
@@ -283,7 +313,7 @@ TEST_F(hierarchy, trace)
 
 		/* Tests child PTRACE_TRACEME. */
 		ret = ptrace(PTRACE_TRACEME);
-		if (variant->domain_parent) {
+		if (!can_trace_child) {
 			EXPECT_EQ(-1, ret);
 			EXPECT_EQ(EPERM, errno);
 		} else {
@@ -296,12 +326,12 @@ TEST_F(hierarchy, trace)
 		 */
 		ASSERT_EQ(1, write(pipe_child[1], ".", 1));
 
-		if (!variant->domain_parent) {
+		if (can_trace_child)
 			ASSERT_EQ(0, raise(SIGSTOP));
-		}
 
 		/* Waits for the parent PTRACE_ATTACH test. */
 		ASSERT_EQ(1, read(pipe_parent[0], &buf_child, 1));
+
 		_exit(_metadata->passed ? EXIT_SUCCESS : EXIT_FAILURE);
 		return;
 	}
@@ -321,7 +351,7 @@ TEST_F(hierarchy, trace)
 	ASSERT_EQ(1, read(pipe_child[0], &buf_parent, 1));
 
 	/* Tests child PTRACE_TRACEME. */
-	if (!variant->domain_parent) {
+	if (can_trace_child) {
 		ASSERT_EQ(child, waitpid(child, &status, 0));
 		ASSERT_EQ(1, WIFSTOPPED(status));
 		ASSERT_EQ(0, ptrace(PTRACE_DETACH, child, NULL, 0));
@@ -334,7 +364,7 @@ TEST_F(hierarchy, trace)
 	/* Tests PTRACE_ATTACH and PTRACE_MODE_READ on the child. */
 	err_proc_read = test_ptrace_read(child);
 	ret = ptrace(PTRACE_ATTACH, child, NULL, 0);
-	if (variant->domain_parent) {
+	if (!can_trace_child) {
 		EXPECT_EQ(-1, ret);
 		EXPECT_EQ(EPERM, errno);
 		EXPECT_EQ(EACCES, err_proc_read);
@@ -350,10 +380,16 @@ TEST_F(hierarchy, trace)
 
 	/* Signals that the parent PTRACE_ATTACH test is done. */
 	ASSERT_EQ(1, write(pipe_parent[1], ".", 1));
+
 	ASSERT_EQ(child, waitpid(child, &status, 0));
 	if (WIFSIGNALED(status) || !WIFEXITED(status) ||
 	    WEXITSTATUS(status) != EXIT_SUCCESS)
 		_metadata->passed = 0;
+
+	if (yama_ptrace_scope > 0)
+		SKIP(return,
+			   "Incomplete tests due to Yama restrictions (scope %d)",
+			   yama_ptrace_scope);
 }
 
 TEST_HARNESS_MAIN
Signature · 1 line
2.39.0.314.g84b9a713c41-goog
#2 lore raw

Re: [PATCH v4 1/1] selftests/landlock: skip ptrace_test according to YAMA

Quoted 15 lines · On Tue, Jan 3, 2023 at 11:03 AM <[email protected]> wrote:

From: Jeff Xu <[email protected]>

Add check for yama setting for ptrace_test.

---
 .../testing/selftests/landlock/ptrace_test.c  | 48 ++++++++++++++++---
 1 file changed, 42 insertions(+), 6 deletions(-)
tools/testing/selftests/landlock/ptrace_test.c +0 -0
index c28ef98ff3ac..379f5ddf6c3f 100644

tools/testing/selftests/landlock/ptrace_test.c static int test_ptrace_read(const pid_t pid) · line 65

Quoted 6 lines
tools/testing/selftests/landlock/ptrace_test.c +3 -0
@@ -60,6 +60,23 @@ static int test_ptrace_read(const pid_t pid)
        return 0;
 }
 
+static int get_yama_ptrace_scope(void)
+{
+       int ret = -1;

Unnecessary initialization

tools/testing/selftests/landlock/ptrace_test.c static int test_ptrace_read(const pid_t pid) · line 66

Quoted 1 line
tools/testing/selftests/landlock/ptrace_test.c +1 -0
+       char buf[2] = {};

Unnecessary initialization

tools/testing/selftests/landlock/ptrace_test.c static int test_ptrace_read(const pid_t pid) · line 72

Quoted 6 lines
tools/testing/selftests/landlock/ptrace_test.c +6 -0
+       int fd = open("/proc/sys/kernel/yama/ptrace_scope", O_RDONLY);
+
+       if (fd < 0)
+               return 0;
+
+       if (read(fd, &buf, 1) < 0)

buf is an array, & is thus unnecessary. Also, if the file is empty, the return value would be 0.

tools/testing/selftests/landlock/ptrace_test.c static int test_ptrace_read(const pid_t pid) · line 73

Quoted 1 line
tools/testing/selftests/landlock/ptrace_test.c +1 -0
+               return -1;

leaking file descriptor

Quoted 18 lines
tools/testing/selftests/landlock/ptrace_test.c +9 -0
+
+       ret = atoi(buf);
+       close(fd);
+       return ret;
+}
+
 /* clang-format off */
 FIXTURE(hierarchy) {};
 /* clang-format on */
@@ -232,8 +249,20 @@ TEST_F(hierarchy, trace)
        pid_t child, parent;
        int status, err_proc_read;
        int pipe_child[2], pipe_parent[2];
+       int yama_ptrace_scope;
        char buf_parent;
        long ret;
+       bool can_trace_child, can_trace_parent;
+

tools/testing/selftests/landlock/ptrace_test.c TEST_F(hierarchy, trace) · line 266

Quoted 10 lines
tools/testing/selftests/landlock/ptrace_test.c +9 -0
+       yama_ptrace_scope = get_yama_ptrace_scope();
+       ASSERT_LE(0, yama_ptrace_scope);
+
+       if (yama_ptrace_scope >= 3)
+               SKIP(return, "Yama forbids any ptrace use (scope %d)",
+                          yama_ptrace_scope);
+
+       can_trace_child = !variant->domain_parent && (yama_ptrace_scope < 2);
+       can_trace_parent = !variant->domain_child && (yama_ptrace_scope < 1);
 

Unnecessary ( ).

It is difficult to understand the context. yama_ptrace_scope == 2 is YAMA_SCOPE_CAPABILITY, and yama_ptrace_scope == 1 is YAMA_SCOPE_RELATIONAL. I for my part have no idea how that relates to child/parent permissions. Also, I have no idea why the negation (can_trace_child = !variant->domain_parent) is necessary, and what its functional impact might be. Someone else will have to chime in here.

tools/testing/selftests/landlock/ptrace_test.c TEST_F(hierarchy, trace) · line 290

Quoted 7 lines
tools/testing/selftests/landlock/ptrace_test.c +1 -0
        /*
         * Removes all effective and permitted capabilities to not interfere
@@ -258,6 +287,7 @@ TEST_F(hierarchy, trace)
 
                ASSERT_EQ(0, close(pipe_parent[1]));
                ASSERT_EQ(0, close(pipe_child[0]));
+

Unnecessary whitespace change

tools/testing/selftests/landlock/ptrace_test.c TEST_F(hierarchy, trace) · line 291

Quoted 1 line
tools/testing/selftests/landlock/ptrace_test.c +0 -0
                if (variant->domain_child)

Why not change this code ?

Quoted 22 lines
tools/testing/selftests/landlock/ptrace_test.c +2 -2
                        create_domain(_metadata);
 
@@ -267,7 +297,7 @@ TEST_F(hierarchy, trace)
                /* Tests PTRACE_ATTACH and PTRACE_MODE_READ on the parent. */
                err_proc_read = test_ptrace_read(parent);
                ret = ptrace(PTRACE_ATTACH, parent, NULL, 0);
-               if (variant->domain_child) {
+               if (!can_trace_parent) {
                        EXPECT_EQ(-1, ret);
                        EXPECT_EQ(EPERM, errno);
                        EXPECT_EQ(EACCES, err_proc_read);
@@ -283,7 +313,7 @@ TEST_F(hierarchy, trace)
 
                /* Tests child PTRACE_TRACEME. */
                ret = ptrace(PTRACE_TRACEME);
-               if (variant->domain_parent) {
+               if (!can_trace_child) {
                        EXPECT_EQ(-1, ret);
                        EXPECT_EQ(EPERM, errno);
                } else {
@@ -296,12 +326,12 @@ TEST_F(hierarchy, trace)
                 */

tools/testing/selftests/landlock/ptrace_test.c TEST_F(hierarchy, trace) · line 334

Quoted 10 lines
tools/testing/selftests/landlock/ptrace_test.c +2 -2
                ASSERT_EQ(1, write(pipe_child[1], ".", 1));
 
-               if (!variant->domain_parent) {
+               if (can_trace_child)
                        ASSERT_EQ(0, raise(SIGSTOP));
-               }
 
                /* Waits for the parent PTRACE_ATTACH test. */
                ASSERT_EQ(1, read(pipe_parent[0], &buf_child, 1));
+

Unnecessary whitespace change

Quoted 22 lines
tools/testing/selftests/landlock/ptrace_test.c +2 -2
                _exit(_metadata->passed ? EXIT_SUCCESS : EXIT_FAILURE);
                return;
        }
@@ -321,7 +351,7 @@ TEST_F(hierarchy, trace)
        ASSERT_EQ(1, read(pipe_child[0], &buf_parent, 1));
 
        /* Tests child PTRACE_TRACEME. */
-       if (!variant->domain_parent) {
+       if (can_trace_child) {
                ASSERT_EQ(child, waitpid(child, &status, 0));
                ASSERT_EQ(1, WIFSTOPPED(status));
                ASSERT_EQ(0, ptrace(PTRACE_DETACH, child, NULL, 0));
@@ -334,7 +364,7 @@ TEST_F(hierarchy, trace)
        /* Tests PTRACE_ATTACH and PTRACE_MODE_READ on the child. */
        err_proc_read = test_ptrace_read(child);
        ret = ptrace(PTRACE_ATTACH, child, NULL, 0);
-       if (variant->domain_parent) {
+       if (!can_trace_child) {
                EXPECT_EQ(-1, ret);
                EXPECT_EQ(EPERM, errno);
                EXPECT_EQ(EACCES, err_proc_read);

tools/testing/selftests/landlock/ptrace_test.c TEST_F(hierarchy, trace) · line 383

Quoted 4 lines
tools/testing/selftests/landlock/ptrace_test.c +1 -0
@@ -350,10 +380,16 @@ TEST_F(hierarchy, trace)
 
        /* Signals that the parent PTRACE_ATTACH test is done. */
        ASSERT_EQ(1, write(pipe_parent[1], ".", 1));
+

Unnecessary whitespace change

Quoted 15 lines
tools/testing/selftests/landlock/ptrace_test.c +5 -1
        ASSERT_EQ(child, waitpid(child, &status, 0));
        if (WIFSIGNALED(status) || !WIFEXITED(status) ||
            WEXITSTATUS(status) != EXIT_SUCCESS)
                _metadata->passed = 0;
+
+       if (yama_ptrace_scope > 0)
+               SKIP(return,
+                          "Incomplete tests due to Yama restrictions (scope %d)",
+                          yama_ptrace_scope);
 }
 
 TEST_HARNESS_MAIN
--

2.39.0.314.g84b9a713c41-goog

#3 lore raw

Re: [PATCH v4 1/1] selftests/landlock: skip ptrace_test according to YAMA

Thanks for the comments.
I agree with most comments, but need Michael to chime in/confirm on below:

Quoted 26 lines · Guenter Roeck
Quoted 15 lines · On Tue, Jan 3, 2023 at 11:03 AM <[email protected]> wrote:

From: Jeff Xu <[email protected]>

Add check for yama setting for ptrace_test.

---
 .../testing/selftests/landlock/ptrace_test.c  | 48 ++++++++++++++++---
 1 file changed, 42 insertions(+), 6 deletions(-)
tools/testing/selftests/landlock/ptrace_test.c +0 -0
index c28ef98ff3ac..379f5ddf6c3f 100644

tools/testing/selftests/landlock/ptrace_test.c static int test_ptrace_read(const pid_t pid) · line 65

Quoted 6 lines
tools/testing/selftests/landlock/ptrace_test.c +3 -0
@@ -60,6 +60,23 @@ static int test_ptrace_read(const pid_t pid)
        return 0;
 }
 
+static int get_yama_ptrace_scope(void)
+{
+       int ret = -1;

Unnecessary initialization

Quoted 4 lines

tools/testing/selftests/landlock/ptrace_test.c static int test_ptrace_read(const pid_t pid) · line 66

Quoted 1 line
tools/testing/selftests/landlock/ptrace_test.c +1 -0
+       char buf[2] = {};

Unnecessary initialization

buf was used later by atoi(), and atoi needs a string, because the function only reads one byte in read(),
so it needs to add buf[1] = '\0'. In V2, there was a comment to change the buf[1] = '\0' to char buf[2] = {},
my understanding is that the compiler is smart enough and will optimize the initialization to write 0 on the
memory (since this is char and length is 2, and less then the size of int)

Quoted 45 lines

tools/testing/selftests/landlock/ptrace_test.c static int test_ptrace_read(const pid_t pid) · line 72

Quoted 6 lines
tools/testing/selftests/landlock/ptrace_test.c +6 -0
+       int fd = open("/proc/sys/kernel/yama/ptrace_scope", O_RDONLY);
+
+       if (fd < 0)
+               return 0;
+
+       if (read(fd, &buf, 1) < 0)

buf is an array, & is thus unnecessary. Also, if the file is empty, the return value would be 0.

tools/testing/selftests/landlock/ptrace_test.c static int test_ptrace_read(const pid_t pid) · line 73

Quoted 1 line
tools/testing/selftests/landlock/ptrace_test.c +1 -0
+               return -1;

leaking file descriptor

Quoted 18 lines
tools/testing/selftests/landlock/ptrace_test.c +9 -0
+
+       ret = atoi(buf);
+       close(fd);
+       return ret;
+}
+
 /* clang-format off */
 FIXTURE(hierarchy) {};
 /* clang-format on */
@@ -232,8 +249,20 @@ TEST_F(hierarchy, trace)
        pid_t child, parent;
        int status, err_proc_read;
        int pipe_child[2], pipe_parent[2];
+       int yama_ptrace_scope;
        char buf_parent;
        long ret;
+       bool can_trace_child, can_trace_parent;
+

tools/testing/selftests/landlock/ptrace_test.c TEST_F(hierarchy, trace) · line 266

Quoted 10 lines
tools/testing/selftests/landlock/ptrace_test.c +9 -0
+       yama_ptrace_scope = get_yama_ptrace_scope();
+       ASSERT_LE(0, yama_ptrace_scope);
+
+       if (yama_ptrace_scope >= 3)
+               SKIP(return, "Yama forbids any ptrace use (scope %d)",
+                          yama_ptrace_scope);
+
+       can_trace_child = !variant->domain_parent && (yama_ptrace_scope < 2);
+       can_trace_parent = !variant->domain_child && (yama_ptrace_scope < 1);
 

Unnecessary ( ).

Quoted 7 lines

It is difficult to understand the context. yama_ptrace_scope == 2 is YAMA_SCOPE_CAPABILITY, and yama_ptrace_scope == 1 is YAMA_SCOPE_RELATIONAL. I for my part have no idea how that relates to child/parent permissions. Also, I have no idea why the negation (can_trace_child = !variant->domain_parent) is necessary, and what its functional impact might be. Someone else will have to chime in here.

I will copy the definition of the constant definition from yama_lsm.c But I agree this code is difficult to understand, I'm now lost on why we need the negation too.

Quoted 10 lines

tools/testing/selftests/landlock/ptrace_test.c TEST_F(hierarchy, trace) · line 290

Quoted 7 lines
tools/testing/selftests/landlock/ptrace_test.c +1 -0
        /*
         * Removes all effective and permitted capabilities to not interfere
@@ -258,6 +287,7 @@ TEST_F(hierarchy, trace)
 
                ASSERT_EQ(0, close(pipe_parent[1]));
                ASSERT_EQ(0, close(pipe_child[0]));
+

Unnecessary whitespace change

Quoted 6 lines

tools/testing/selftests/landlock/ptrace_test.c TEST_F(hierarchy, trace) · line 291

Quoted 1 line
tools/testing/selftests/landlock/ptrace_test.c +0 -0
                if (variant->domain_child)

Why not change this code ?

Quoted 2 lines
tools/testing/selftests/landlock/ptrace_test.c +0 -0
                        create_domain(_metadata);
 

create_domain actually applies the landlocked policy to the (child/parent) process.
This is part of the setup of the testcase, so it is needed.

Quoted 77 lines
Quoted 20 lines
tools/testing/selftests/landlock/ptrace_test.c +2 -2
@@ -267,7 +297,7 @@ TEST_F(hierarchy, trace)
                /* Tests PTRACE_ATTACH and PTRACE_MODE_READ on the parent. */
                err_proc_read = test_ptrace_read(parent);
                ret = ptrace(PTRACE_ATTACH, parent, NULL, 0);
-               if (variant->domain_child) {
+               if (!can_trace_parent) {
                        EXPECT_EQ(-1, ret);
                        EXPECT_EQ(EPERM, errno);
                        EXPECT_EQ(EACCES, err_proc_read);
@@ -283,7 +313,7 @@ TEST_F(hierarchy, trace)
 
                /* Tests child PTRACE_TRACEME. */
                ret = ptrace(PTRACE_TRACEME);
-               if (variant->domain_parent) {
+               if (!can_trace_child) {
                        EXPECT_EQ(-1, ret);
                        EXPECT_EQ(EPERM, errno);
                } else {
@@ -296,12 +326,12 @@ TEST_F(hierarchy, trace)
                 */

tools/testing/selftests/landlock/ptrace_test.c TEST_F(hierarchy, trace) · line 334

Quoted 10 lines
tools/testing/selftests/landlock/ptrace_test.c +2 -2
                ASSERT_EQ(1, write(pipe_child[1], ".", 1));
 
-               if (!variant->domain_parent) {
+               if (can_trace_child)
                        ASSERT_EQ(0, raise(SIGSTOP));
-               }
 
                /* Waits for the parent PTRACE_ATTACH test. */
                ASSERT_EQ(1, read(pipe_parent[0], &buf_child, 1));
+

Unnecessary whitespace change

Quoted 22 lines
tools/testing/selftests/landlock/ptrace_test.c +2 -2
                _exit(_metadata->passed ? EXIT_SUCCESS : EXIT_FAILURE);
                return;
        }
@@ -321,7 +351,7 @@ TEST_F(hierarchy, trace)
        ASSERT_EQ(1, read(pipe_child[0], &buf_parent, 1));
 
        /* Tests child PTRACE_TRACEME. */
-       if (!variant->domain_parent) {
+       if (can_trace_child) {
                ASSERT_EQ(child, waitpid(child, &status, 0));
                ASSERT_EQ(1, WIFSTOPPED(status));
                ASSERT_EQ(0, ptrace(PTRACE_DETACH, child, NULL, 0));
@@ -334,7 +364,7 @@ TEST_F(hierarchy, trace)
        /* Tests PTRACE_ATTACH and PTRACE_MODE_READ on the child. */
        err_proc_read = test_ptrace_read(child);
        ret = ptrace(PTRACE_ATTACH, child, NULL, 0);
-       if (variant->domain_parent) {
+       if (!can_trace_child) {
                EXPECT_EQ(-1, ret);
                EXPECT_EQ(EPERM, errno);
                EXPECT_EQ(EACCES, err_proc_read);

tools/testing/selftests/landlock/ptrace_test.c TEST_F(hierarchy, trace) · line 383

Quoted 4 lines
tools/testing/selftests/landlock/ptrace_test.c +1 -0
@@ -350,10 +380,16 @@ TEST_F(hierarchy, trace)
 
        /* Signals that the parent PTRACE_ATTACH test is done. */
        ASSERT_EQ(1, write(pipe_parent[1], ".", 1));
+

Unnecessary whitespace change

Quoted 15 lines
tools/testing/selftests/landlock/ptrace_test.c +5 -1
        ASSERT_EQ(child, waitpid(child, &status, 0));
        if (WIFSIGNALED(status) || !WIFEXITED(status) ||
            WEXITSTATUS(status) != EXIT_SUCCESS)
                _metadata->passed = 0;
+
+       if (yama_ptrace_scope > 0)
+               SKIP(return,
+                          "Incomplete tests due to Yama restrictions (scope %d)",
+                          yama_ptrace_scope);
 }
 
 TEST_HARNESS_MAIN
--

2.39.0.314.g84b9a713c41-goog

#4 lore raw

Re: [PATCH v4 1/1] selftests/landlock: skip ptrace_test according to YAMA

Quoted 35 lines · Jeff Xu

Thanks for the comments.
I agree with most comments, but need Michael to chime in/confirm on below:

Quoted 26 lines · Guenter Roeck
Quoted 15 lines · On Tue, Jan 3, 2023 at 11:03 AM <[email protected]> wrote:

From: Jeff Xu <[email protected]>

Add check for yama setting for ptrace_test.

---
 .../testing/selftests/landlock/ptrace_test.c  | 48 ++++++++++++++++---
 1 file changed, 42 insertions(+), 6 deletions(-)
tools/testing/selftests/landlock/ptrace_test.c +0 -0
index c28ef98ff3ac..379f5ddf6c3f 100644

tools/testing/selftests/landlock/ptrace_test.c static int test_ptrace_read(const pid_t pid) · line 65

Quoted 6 lines
tools/testing/selftests/landlock/ptrace_test.c +3 -0
@@ -60,6 +60,23 @@ static int test_ptrace_read(const pid_t pid)
        return 0;
 }
 
+static int get_yama_ptrace_scope(void)
+{
+       int ret = -1;

Unnecessary initialization

Quoted 4 lines

tools/testing/selftests/landlock/ptrace_test.c static int test_ptrace_read(const pid_t pid) · line 66

Quoted 1 line
tools/testing/selftests/landlock/ptrace_test.c +1 -0
+       char buf[2] = {};

Unnecessary initialization

Quoted 8 lines

buf was used later by atoi(), and atoi needs a string, because the function only reads one byte in read(),
so it needs to add buf[1] = '\0'. In V2, there was a comment to change the buf[1] = '\0' to char buf[2] = {},
my understanding is that the compiler is smart enough and will optimize the initialization to write 0 on the
memory (since this is char and length is 2, and less then the size of int)

Good point.

Guenter

Quoted 154 lines
Quoted 45 lines

tools/testing/selftests/landlock/ptrace_test.c static int test_ptrace_read(const pid_t pid) · line 72

Quoted 6 lines
tools/testing/selftests/landlock/ptrace_test.c +6 -0
+       int fd = open("/proc/sys/kernel/yama/ptrace_scope", O_RDONLY);
+
+       if (fd < 0)
+               return 0;
+
+       if (read(fd, &buf, 1) < 0)

buf is an array, & is thus unnecessary. Also, if the file is empty, the return value would be 0.

tools/testing/selftests/landlock/ptrace_test.c static int test_ptrace_read(const pid_t pid) · line 73

Quoted 1 line
tools/testing/selftests/landlock/ptrace_test.c +1 -0
+               return -1;

leaking file descriptor

Quoted 18 lines
tools/testing/selftests/landlock/ptrace_test.c +9 -0
+
+       ret = atoi(buf);
+       close(fd);
+       return ret;
+}
+
 /* clang-format off */
 FIXTURE(hierarchy) {};
 /* clang-format on */
@@ -232,8 +249,20 @@ TEST_F(hierarchy, trace)
        pid_t child, parent;
        int status, err_proc_read;
        int pipe_child[2], pipe_parent[2];
+       int yama_ptrace_scope;
        char buf_parent;
        long ret;
+       bool can_trace_child, can_trace_parent;
+

tools/testing/selftests/landlock/ptrace_test.c TEST_F(hierarchy, trace) · line 266

Quoted 10 lines
tools/testing/selftests/landlock/ptrace_test.c +9 -0
+       yama_ptrace_scope = get_yama_ptrace_scope();
+       ASSERT_LE(0, yama_ptrace_scope);
+
+       if (yama_ptrace_scope >= 3)
+               SKIP(return, "Yama forbids any ptrace use (scope %d)",
+                          yama_ptrace_scope);
+
+       can_trace_child = !variant->domain_parent && (yama_ptrace_scope < 2);
+       can_trace_parent = !variant->domain_child && (yama_ptrace_scope < 1);
 

Unnecessary ( ).

Quoted 7 lines

It is difficult to understand the context. yama_ptrace_scope == 2 is YAMA_SCOPE_CAPABILITY, and yama_ptrace_scope == 1 is YAMA_SCOPE_RELATIONAL. I for my part have no idea how that relates to child/parent permissions. Also, I have no idea why the negation (can_trace_child = !variant->domain_parent) is necessary, and what its functional impact might be. Someone else will have to chime in here.

I will copy the definition of the constant definition from yama_lsm.c But I agree this code is difficult to understand, I'm now lost on why we need the negation too.

Quoted 10 lines

tools/testing/selftests/landlock/ptrace_test.c TEST_F(hierarchy, trace) · line 290

Quoted 7 lines
tools/testing/selftests/landlock/ptrace_test.c +1 -0
        /*
         * Removes all effective and permitted capabilities to not interfere
@@ -258,6 +287,7 @@ TEST_F(hierarchy, trace)
 
                ASSERT_EQ(0, close(pipe_parent[1]));
                ASSERT_EQ(0, close(pipe_child[0]));
+

Unnecessary whitespace change

Quoted 6 lines

tools/testing/selftests/landlock/ptrace_test.c TEST_F(hierarchy, trace) · line 291

Quoted 1 line
tools/testing/selftests/landlock/ptrace_test.c +0 -0
                if (variant->domain_child)

Why not change this code ?

Quoted 2 lines
tools/testing/selftests/landlock/ptrace_test.c +0 -0
                        create_domain(_metadata);
 

create_domain actually applies the landlocked policy to the (child/parent) process.
This is part of the setup of the testcase, so it is needed.

Quoted 77 lines
Quoted 20 lines
tools/testing/selftests/landlock/ptrace_test.c +2 -2
@@ -267,7 +297,7 @@ TEST_F(hierarchy, trace)
                /* Tests PTRACE_ATTACH and PTRACE_MODE_READ on the parent. */
                err_proc_read = test_ptrace_read(parent);
                ret = ptrace(PTRACE_ATTACH, parent, NULL, 0);
-               if (variant->domain_child) {
+               if (!can_trace_parent) {
                        EXPECT_EQ(-1, ret);
                        EXPECT_EQ(EPERM, errno);
                        EXPECT_EQ(EACCES, err_proc_read);
@@ -283,7 +313,7 @@ TEST_F(hierarchy, trace)
 
                /* Tests child PTRACE_TRACEME. */
                ret = ptrace(PTRACE_TRACEME);
-               if (variant->domain_parent) {
+               if (!can_trace_child) {
                        EXPECT_EQ(-1, ret);
                        EXPECT_EQ(EPERM, errno);
                } else {
@@ -296,12 +326,12 @@ TEST_F(hierarchy, trace)
                 */

tools/testing/selftests/landlock/ptrace_test.c TEST_F(hierarchy, trace) · line 334

Quoted 10 lines
tools/testing/selftests/landlock/ptrace_test.c +2 -2
                ASSERT_EQ(1, write(pipe_child[1], ".", 1));
 
-               if (!variant->domain_parent) {
+               if (can_trace_child)
                        ASSERT_EQ(0, raise(SIGSTOP));
-               }
 
                /* Waits for the parent PTRACE_ATTACH test. */
                ASSERT_EQ(1, read(pipe_parent[0], &buf_child, 1));
+

Unnecessary whitespace change

Quoted 22 lines
tools/testing/selftests/landlock/ptrace_test.c +2 -2
                _exit(_metadata->passed ? EXIT_SUCCESS : EXIT_FAILURE);
                return;
        }
@@ -321,7 +351,7 @@ TEST_F(hierarchy, trace)
        ASSERT_EQ(1, read(pipe_child[0], &buf_parent, 1));
 
        /* Tests child PTRACE_TRACEME. */
-       if (!variant->domain_parent) {
+       if (can_trace_child) {
                ASSERT_EQ(child, waitpid(child, &status, 0));
                ASSERT_EQ(1, WIFSTOPPED(status));
                ASSERT_EQ(0, ptrace(PTRACE_DETACH, child, NULL, 0));
@@ -334,7 +364,7 @@ TEST_F(hierarchy, trace)
        /* Tests PTRACE_ATTACH and PTRACE_MODE_READ on the child. */
        err_proc_read = test_ptrace_read(child);
        ret = ptrace(PTRACE_ATTACH, child, NULL, 0);
-       if (variant->domain_parent) {
+       if (!can_trace_child) {
                EXPECT_EQ(-1, ret);
                EXPECT_EQ(EPERM, errno);
                EXPECT_EQ(EACCES, err_proc_read);

tools/testing/selftests/landlock/ptrace_test.c TEST_F(hierarchy, trace) · line 383

Quoted 4 lines
tools/testing/selftests/landlock/ptrace_test.c +1 -0
@@ -350,10 +380,16 @@ TEST_F(hierarchy, trace)
 
        /* Signals that the parent PTRACE_ATTACH test is done. */
        ASSERT_EQ(1, write(pipe_parent[1], ".", 1));
+

Unnecessary whitespace change

Quoted 15 lines
tools/testing/selftests/landlock/ptrace_test.c +5 -1
        ASSERT_EQ(child, waitpid(child, &status, 0));
        if (WIFSIGNALED(status) || !WIFEXITED(status) ||
            WEXITSTATUS(status) != EXIT_SUCCESS)
                _metadata->passed = 0;
+
+       if (yama_ptrace_scope > 0)
+               SKIP(return,
+                          "Incomplete tests due to Yama restrictions (scope %d)",
+                          yama_ptrace_scope);
 }
 
 TEST_HARNESS_MAIN
--

2.39.0.314.g84b9a713c41-goog

maintainer
#5 lore raw

Re: [PATCH v4 1/1] selftests/landlock: skip ptrace_test according to YAMA

Looks good and agree with Guenter's suggestions

Quoted 45 lines · Guenter Roeck
Quoted 35 lines · Jeff Xu

Thanks for the comments.
I agree with most comments, but need Michael to chime in/confirm on below:

Quoted 26 lines · Guenter Roeck
Quoted 15 lines · On Tue, Jan 3, 2023 at 11:03 AM <[email protected]> wrote:

From: Jeff Xu <[email protected]>

Add check for yama setting for ptrace_test.

---
  .../testing/selftests/landlock/ptrace_test.c  | 48 ++++++++++++++++---
  1 file changed, 42 insertions(+), 6 deletions(-)
tools/testing/selftests/landlock/ptrace_test.c +0 -0
index c28ef98ff3ac..379f5ddf6c3f 100644

tools/testing/selftests/landlock/ptrace_test.c static int test_ptrace_read(const pid_t pid) · line 65

Quoted 6 lines
tools/testing/selftests/landlock/ptrace_test.c +3 -0
@@ -60,6 +60,23 @@ static int test_ptrace_read(const pid_t pid)
         return 0;
  }
 
+static int get_yama_ptrace_scope(void)
+{
+       int ret = -1;

Unnecessary initialization

Quoted 4 lines

tools/testing/selftests/landlock/ptrace_test.c static int test_ptrace_read(const pid_t pid) · line 66

Quoted 1 line
tools/testing/selftests/landlock/ptrace_test.c +1 -0
+       char buf[2] = {};

Unnecessary initialization

Quoted 8 lines

buf was used later by atoi(), and atoi needs a string, because the function only reads one byte in read(),
so it needs to add buf[1] = '\0'. In V2, there was a comment to change the buf[1] = '\0' to char buf[2] = {},
my understanding is that the compiler is smart enough and will optimize the initialization to write 0 on the
memory (since this is char and length is 2, and less then the size of int)

Quoted 3 lines

Good point.

Guenter

Looks good to me with the other suggestions applied.

Quoted 155 lines
Quoted 155 lines
Quoted 46 lines

tools/testing/selftests/landlock/ptrace_test.c static int test_ptrace_read(const pid_t pid) · line 72

Quoted 7 lines
tools/testing/selftests/landlock/ptrace_test.c +6 -0
+       int fd = open("/proc/sys/kernel/yama/ptrace_scope", O_RDONLY);
+
+       if (fd < 0)
+               return 0;
+
+       if (read(fd, &buf, 1) < 0)

buf is an array, & is thus unnecessary. Also, if the file is empty, the return value would be 0.

tools/testing/selftests/landlock/ptrace_test.c static int test_ptrace_read(const pid_t pid) · line 73

Quoted 1 line
tools/testing/selftests/landlock/ptrace_test.c +1 -0
+               return -1;

leaking file descriptor

Quoted 18 lines
tools/testing/selftests/landlock/ptrace_test.c +9 -0
+
+       ret = atoi(buf);
+       close(fd);
+       return ret;
+}
+
  /* clang-format off */
  FIXTURE(hierarchy) {};
  /* clang-format on */
@@ -232,8 +249,20 @@ TEST_F(hierarchy, trace)
         pid_t child, parent;
         int status, err_proc_read;
         int pipe_child[2], pipe_parent[2];
+       int yama_ptrace_scope;
         char buf_parent;
         long ret;
+       bool can_trace_child, can_trace_parent;
+

tools/testing/selftests/landlock/ptrace_test.c TEST_F(hierarchy, trace) · line 266

Quoted 10 lines
tools/testing/selftests/landlock/ptrace_test.c +9 -0
+       yama_ptrace_scope = get_yama_ptrace_scope();
+       ASSERT_LE(0, yama_ptrace_scope);
+
+       if (yama_ptrace_scope >= 3)
+               SKIP(return, "Yama forbids any ptrace use (scope %d)",
+                          yama_ptrace_scope);
+
+       can_trace_child = !variant->domain_parent && (yama_ptrace_scope < 2);
+       can_trace_parent = !variant->domain_child && (yama_ptrace_scope < 1);
 

Unnecessary ( ).

Quoted 7 lines

It is difficult to understand the context. yama_ptrace_scope == 2 is YAMA_SCOPE_CAPABILITY, and yama_ptrace_scope == 1 is YAMA_SCOPE_RELATIONAL. I for my part have no idea how that relates to child/parent permissions. Also, I have no idea why the negation (can_trace_child = !variant->domain_parent) is necessary, and what its functional impact might be. Someone else will have to chime in here.

I will copy the definition of the constant definition from yama_lsm.c But I agree this code is difficult to understand, I'm now lost on why we need the negation too.

Quoted 10 lines

tools/testing/selftests/landlock/ptrace_test.c TEST_F(hierarchy, trace) · line 290

Quoted 7 lines
tools/testing/selftests/landlock/ptrace_test.c +1 -0
         /*
          * Removes all effective and permitted capabilities to not interfere
@@ -258,6 +287,7 @@ TEST_F(hierarchy, trace)
 
                 ASSERT_EQ(0, close(pipe_parent[1]));
                 ASSERT_EQ(0, close(pipe_child[0]));
+

Unnecessary whitespace change

Quoted 6 lines

tools/testing/selftests/landlock/ptrace_test.c TEST_F(hierarchy, trace) · line 291

Quoted 1 line
tools/testing/selftests/landlock/ptrace_test.c +0 -0
                 if (variant->domain_child)

Why not change this code ?

Quoted 2 lines
tools/testing/selftests/landlock/ptrace_test.c +0 -0
                         create_domain(_metadata);
 

create_domain actually applies the landlocked policy to the (child/parent) process.
This is part of the setup of the testcase, so it is needed.

Quoted 77 lines
Quoted 20 lines
tools/testing/selftests/landlock/ptrace_test.c +2 -2
@@ -267,7 +297,7 @@ TEST_F(hierarchy, trace)
                 /* Tests PTRACE_ATTACH and PTRACE_MODE_READ on the parent. */
                 err_proc_read = test_ptrace_read(parent);
                 ret = ptrace(PTRACE_ATTACH, parent, NULL, 0);
-               if (variant->domain_child) {
+               if (!can_trace_parent) {
                         EXPECT_EQ(-1, ret);
                         EXPECT_EQ(EPERM, errno);
                         EXPECT_EQ(EACCES, err_proc_read);
@@ -283,7 +313,7 @@ TEST_F(hierarchy, trace)
 
                 /* Tests child PTRACE_TRACEME. */
                 ret = ptrace(PTRACE_TRACEME);
-               if (variant->domain_parent) {
+               if (!can_trace_child) {
                         EXPECT_EQ(-1, ret);
                         EXPECT_EQ(EPERM, errno);
                 } else {
@@ -296,12 +326,12 @@ TEST_F(hierarchy, trace)
                  */

tools/testing/selftests/landlock/ptrace_test.c TEST_F(hierarchy, trace) · line 334

Quoted 10 lines
tools/testing/selftests/landlock/ptrace_test.c +2 -2
                 ASSERT_EQ(1, write(pipe_child[1], ".", 1));
 
-               if (!variant->domain_parent) {
+               if (can_trace_child)
                         ASSERT_EQ(0, raise(SIGSTOP));
-               }
 
                 /* Waits for the parent PTRACE_ATTACH test. */
                 ASSERT_EQ(1, read(pipe_parent[0], &buf_child, 1));
+

Unnecessary whitespace change

Quoted 22 lines
tools/testing/selftests/landlock/ptrace_test.c +2 -2
                 _exit(_metadata->passed ? EXIT_SUCCESS : EXIT_FAILURE);
                 return;
         }
@@ -321,7 +351,7 @@ TEST_F(hierarchy, trace)
         ASSERT_EQ(1, read(pipe_child[0], &buf_parent, 1));
 
         /* Tests child PTRACE_TRACEME. */
-       if (!variant->domain_parent) {
+       if (can_trace_child) {
                 ASSERT_EQ(child, waitpid(child, &status, 0));
                 ASSERT_EQ(1, WIFSTOPPED(status));
                 ASSERT_EQ(0, ptrace(PTRACE_DETACH, child, NULL, 0));
@@ -334,7 +364,7 @@ TEST_F(hierarchy, trace)
         /* Tests PTRACE_ATTACH and PTRACE_MODE_READ on the child. */
         err_proc_read = test_ptrace_read(child);
         ret = ptrace(PTRACE_ATTACH, child, NULL, 0);
-       if (variant->domain_parent) {
+       if (!can_trace_child) {
                 EXPECT_EQ(-1, ret);
                 EXPECT_EQ(EPERM, errno);
                 EXPECT_EQ(EACCES, err_proc_read);

tools/testing/selftests/landlock/ptrace_test.c TEST_F(hierarchy, trace) · line 383

Quoted 4 lines
tools/testing/selftests/landlock/ptrace_test.c +1 -0
@@ -350,10 +380,16 @@ TEST_F(hierarchy, trace)
 
         /* Signals that the parent PTRACE_ATTACH test is done. */
         ASSERT_EQ(1, write(pipe_parent[1], ".", 1));
+

Unnecessary whitespace change

Quoted 15 lines
tools/testing/selftests/landlock/ptrace_test.c +5 -1
         ASSERT_EQ(child, waitpid(child, &status, 0));
         if (WIFSIGNALED(status) || !WIFEXITED(status) ||
             WEXITSTATUS(status) != EXIT_SUCCESS)
                 _metadata->passed = 0;
+
+       if (yama_ptrace_scope > 0)
+               SKIP(return,
+                          "Incomplete tests due to Yama restrictions (scope %d)",
+                          yama_ptrace_scope);
  }
 
  TEST_HARNESS_MAIN
--

2.39.0.314.g84b9a713c41-goog

#6 lore raw

Re: [PATCH v4 1/1] selftests/landlock: skip ptrace_test according to YAMA

Quoted 49 lines · Mickaël Salaün

Looks good and agree with Guenter's suggestions

Quoted 45 lines · Guenter Roeck
Quoted 43 lines · Jeff Xu

Thanks for the comments.
I agree with most comments, but need Michael to chime in/confirm on below:

Quoted 26 lines · Guenter Roeck
Quoted 15 lines · On Tue, Jan 3, 2023 at 11:03 AM <[email protected]> wrote:

From: Jeff Xu <[email protected]>

Add check for yama setting for ptrace_test.

---
  .../testing/selftests/landlock/ptrace_test.c  | 48 ++++++++++++++++---
  1 file changed, 42 insertions(+), 6 deletions(-)
tools/testing/selftests/landlock/ptrace_test.c +0 -0
index c28ef98ff3ac..379f5ddf6c3f 100644

tools/testing/selftests/landlock/ptrace_test.c static int test_ptrace_read(const pid_t pid) · line 65

Quoted 6 lines
tools/testing/selftests/landlock/ptrace_test.c +3 -0
@@ -60,6 +60,23 @@ static int test_ptrace_read(const pid_t pid)
         return 0;
  }
 
+static int get_yama_ptrace_scope(void)
+{
+       int ret = -1;

Unnecessary initialization

Quoted 4 lines

tools/testing/selftests/landlock/ptrace_test.c static int test_ptrace_read(const pid_t pid) · line 66

Quoted 1 line
tools/testing/selftests/landlock/ptrace_test.c +1 -0
+       char buf[2] = {};

Unnecessary initialization

buf was used later by atoi(), and atoi needs a string, because the function only reads one byte in read(),
so it needs to add buf[1] = '\0'. In V2, there was a comment to change the buf[1] = '\0' to char buf[2] = {},
my understanding is that the compiler is smart enough and will optimize the initialization to write 0 on the
memory (since this is char and length is 2, and less then the size of int)

Quoted 64 lines
Quoted 3 lines

Good point.

Guenter

Looks good to me with the other suggestions applied.

Quoted 57 lines
Quoted 57 lines
Quoted 46 lines

tools/testing/selftests/landlock/ptrace_test.c static int test_ptrace_read(const pid_t pid) · line 72

Quoted 7 lines
tools/testing/selftests/landlock/ptrace_test.c +6 -0
+       int fd = open("/proc/sys/kernel/yama/ptrace_scope", O_RDONLY);
+
+       if (fd < 0)
+               return 0;
+
+       if (read(fd, &buf, 1) < 0)

buf is an array, & is thus unnecessary. Also, if the file is empty, the return value would be 0.

tools/testing/selftests/landlock/ptrace_test.c static int test_ptrace_read(const pid_t pid) · line 73

Quoted 1 line
tools/testing/selftests/landlock/ptrace_test.c +1 -0
+               return -1;

leaking file descriptor

Quoted 18 lines
tools/testing/selftests/landlock/ptrace_test.c +9 -0
+
+       ret = atoi(buf);
+       close(fd);
+       return ret;
+}
+
  /* clang-format off */
  FIXTURE(hierarchy) {};
  /* clang-format on */
@@ -232,8 +249,20 @@ TEST_F(hierarchy, trace)
         pid_t child, parent;
         int status, err_proc_read;
         int pipe_child[2], pipe_parent[2];
+       int yama_ptrace_scope;
         char buf_parent;
         long ret;
+       bool can_trace_child, can_trace_parent;
+

tools/testing/selftests/landlock/ptrace_test.c TEST_F(hierarchy, trace) · line 266

Quoted 10 lines
tools/testing/selftests/landlock/ptrace_test.c +9 -0
+       yama_ptrace_scope = get_yama_ptrace_scope();
+       ASSERT_LE(0, yama_ptrace_scope);
+
+       if (yama_ptrace_scope >= 3)
+               SKIP(return, "Yama forbids any ptrace use (scope %d)",
+                          yama_ptrace_scope);
+
+       can_trace_child = !variant->domain_parent && (yama_ptrace_scope < 2);
+       can_trace_parent = !variant->domain_child && (yama_ptrace_scope < 1);
 

Unnecessary ( ).

Quoted 7 lines

It is difficult to understand the context. yama_ptrace_scope == 2 is YAMA_SCOPE_CAPABILITY, and yama_ptrace_scope == 1 is YAMA_SCOPE_RELATIONAL. I for my part have no idea how that relates to child/parent permissions. Also, I have no idea why the negation (can_trace_child = !variant->domain_parent) is necessary, and what its functional impact might be. Someone else will have to chime in here.

I will copy the definition of the constant definition from yama_lsm.c But I agree this code is difficult to understand, I'm now lost on why we need the negation too.

Hi Mickaël

Can you check the above comment please ?
I also find it difficult to understand how can_trace_child is set.

On this line:
can_trace_child = !variant->domain_parent &&
yama_ptrace_scope < 2;

it translates to
can_trace_child is true when 1> && 2>
1> when parent process don't have landlock policy
2> yama_ptrace_scope = 0 or 1.

My question is:
When the parent process has a landlock policy, and 2 is true, the parent can also trace the child process, right ? So 1> is not necessary in theory ?

As reference: the latest code (after updating the rest of comments in V7) can be found at patchset 8 of
https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/4084253

Thanks
Jeff

Quoted 98 lines
Quoted 98 lines
Quoted 98 lines
Quoted 10 lines

tools/testing/selftests/landlock/ptrace_test.c TEST_F(hierarchy, trace) · line 290

Quoted 7 lines
tools/testing/selftests/landlock/ptrace_test.c +1 -0
         /*
          * Removes all effective and permitted capabilities to not interfere
@@ -258,6 +287,7 @@ TEST_F(hierarchy, trace)
 
                 ASSERT_EQ(0, close(pipe_parent[1]));
                 ASSERT_EQ(0, close(pipe_child[0]));
+

Unnecessary whitespace change

Quoted 6 lines

tools/testing/selftests/landlock/ptrace_test.c TEST_F(hierarchy, trace) · line 291

Quoted 1 line
tools/testing/selftests/landlock/ptrace_test.c +0 -0
                 if (variant->domain_child)

Why not change this code ?

Quoted 2 lines
tools/testing/selftests/landlock/ptrace_test.c +0 -0
                         create_domain(_metadata);
 

create_domain actually applies the landlocked policy to the (child/parent) process.
This is part of the setup of the testcase, so it is needed.

Quoted 77 lines
Quoted 20 lines
tools/testing/selftests/landlock/ptrace_test.c +2 -2
@@ -267,7 +297,7 @@ TEST_F(hierarchy, trace)
                 /* Tests PTRACE_ATTACH and PTRACE_MODE_READ on the parent. */
                 err_proc_read = test_ptrace_read(parent);
                 ret = ptrace(PTRACE_ATTACH, parent, NULL, 0);
-               if (variant->domain_child) {
+               if (!can_trace_parent) {
                         EXPECT_EQ(-1, ret);
                         EXPECT_EQ(EPERM, errno);
                         EXPECT_EQ(EACCES, err_proc_read);
@@ -283,7 +313,7 @@ TEST_F(hierarchy, trace)
 
                 /* Tests child PTRACE_TRACEME. */
                 ret = ptrace(PTRACE_TRACEME);
-               if (variant->domain_parent) {
+               if (!can_trace_child) {
                         EXPECT_EQ(-1, ret);
                         EXPECT_EQ(EPERM, errno);
                 } else {
@@ -296,12 +326,12 @@ TEST_F(hierarchy, trace)
                  */

tools/testing/selftests/landlock/ptrace_test.c TEST_F(hierarchy, trace) · line 334

Quoted 10 lines
tools/testing/selftests/landlock/ptrace_test.c +2 -2
                 ASSERT_EQ(1, write(pipe_child[1], ".", 1));
 
-               if (!variant->domain_parent) {
+               if (can_trace_child)
                         ASSERT_EQ(0, raise(SIGSTOP));
-               }
 
                 /* Waits for the parent PTRACE_ATTACH test. */
                 ASSERT_EQ(1, read(pipe_parent[0], &buf_child, 1));
+

Unnecessary whitespace change

Quoted 22 lines
tools/testing/selftests/landlock/ptrace_test.c +2 -2
                 _exit(_metadata->passed ? EXIT_SUCCESS : EXIT_FAILURE);
                 return;
         }
@@ -321,7 +351,7 @@ TEST_F(hierarchy, trace)
         ASSERT_EQ(1, read(pipe_child[0], &buf_parent, 1));
 
         /* Tests child PTRACE_TRACEME. */
-       if (!variant->domain_parent) {
+       if (can_trace_child) {
                 ASSERT_EQ(child, waitpid(child, &status, 0));
                 ASSERT_EQ(1, WIFSTOPPED(status));
                 ASSERT_EQ(0, ptrace(PTRACE_DETACH, child, NULL, 0));
@@ -334,7 +364,7 @@ TEST_F(hierarchy, trace)
         /* Tests PTRACE_ATTACH and PTRACE_MODE_READ on the child. */
         err_proc_read = test_ptrace_read(child);
         ret = ptrace(PTRACE_ATTACH, child, NULL, 0);
-       if (variant->domain_parent) {
+       if (!can_trace_child) {
                 EXPECT_EQ(-1, ret);
                 EXPECT_EQ(EPERM, errno);
                 EXPECT_EQ(EACCES, err_proc_read);

tools/testing/selftests/landlock/ptrace_test.c TEST_F(hierarchy, trace) · line 383

Quoted 4 lines
tools/testing/selftests/landlock/ptrace_test.c +1 -0
@@ -350,10 +380,16 @@ TEST_F(hierarchy, trace)
 
         /* Signals that the parent PTRACE_ATTACH test is done. */
         ASSERT_EQ(1, write(pipe_parent[1], ".", 1));
+

Unnecessary whitespace change

Quoted 15 lines
tools/testing/selftests/landlock/ptrace_test.c +5 -1
         ASSERT_EQ(child, waitpid(child, &status, 0));
         if (WIFSIGNALED(status) || !WIFEXITED(status) ||
             WEXITSTATUS(status) != EXIT_SUCCESS)
                 _metadata->passed = 0;
+
+       if (yama_ptrace_scope > 0)
+               SKIP(return,
+                          "Incomplete tests due to Yama restrictions (scope %d)",
+                          yama_ptrace_scope);
  }
 
  TEST_HARNESS_MAIN
--

2.39.0.314.g84b9a713c41-goog

maintainer
#7 lore raw

Re: [PATCH v4 1/1] selftests/landlock: skip ptrace_test according to YAMA

Quoted 103 lines · Jeff Xu
Quoted 102 lines · Mickaël Salaün

Looks good and agree with Guenter's suggestions

Quoted 45 lines · Guenter Roeck
Quoted 35 lines · Jeff Xu

Thanks for the comments.
I agree with most comments, but need Michael to chime in/confirm on below:

Quoted 26 lines · Guenter Roeck
Quoted 15 lines · On Tue, Jan 3, 2023 at 11:03 AM <[email protected]> wrote:

From: Jeff Xu <[email protected]>

Add check for yama setting for ptrace_test.

---
   .../testing/selftests/landlock/ptrace_test.c  | 48 ++++++++++++++++---
   1 file changed, 42 insertions(+), 6 deletions(-)
tools/testing/selftests/landlock/ptrace_test.c +0 -0
index c28ef98ff3ac..379f5ddf6c3f 100644

tools/testing/selftests/landlock/ptrace_test.c static int test_ptrace_read(const pid_t pid) · line 65

Quoted 6 lines
tools/testing/selftests/landlock/ptrace_test.c +3 -0
@@ -60,6 +60,23 @@ static int test_ptrace_read(const pid_t pid)
          return 0;
   }
 
+static int get_yama_ptrace_scope(void)
+{
+       int ret = -1;

Unnecessary initialization

Quoted 4 lines

tools/testing/selftests/landlock/ptrace_test.c static int test_ptrace_read(const pid_t pid) · line 66

Quoted 1 line
tools/testing/selftests/landlock/ptrace_test.c +1 -0
+       char buf[2] = {};

Unnecessary initialization

Quoted 8 lines

buf was used later by atoi(), and atoi needs a string, because the function only reads one byte in read(),
so it needs to add buf[1] = '\0'. In V2, there was a comment to change the buf[1] = '\0' to char buf[2] = {},
my understanding is that the compiler is smart enough and will optimize the initialization to write 0 on the
memory (since this is char and length is 2, and less then the size of int)

Quoted 3 lines

Good point.

Guenter

Looks good to me with the other suggestions applied.

Quoted 46 lines
Quoted 46 lines
Quoted 46 lines

tools/testing/selftests/landlock/ptrace_test.c static int test_ptrace_read(const pid_t pid) · line 72

Quoted 7 lines
tools/testing/selftests/landlock/ptrace_test.c +6 -0
+       int fd = open("/proc/sys/kernel/yama/ptrace_scope", O_RDONLY);
+
+       if (fd < 0)
+               return 0;
+
+       if (read(fd, &buf, 1) < 0)

buf is an array, & is thus unnecessary. Also, if the file is empty, the return value would be 0.

tools/testing/selftests/landlock/ptrace_test.c static int test_ptrace_read(const pid_t pid) · line 73

Quoted 1 line
tools/testing/selftests/landlock/ptrace_test.c +1 -0
+               return -1;

leaking file descriptor

Quoted 18 lines
tools/testing/selftests/landlock/ptrace_test.c +9 -0
+
+       ret = atoi(buf);
+       close(fd);
+       return ret;
+}
+
   /* clang-format off */
   FIXTURE(hierarchy) {};
   /* clang-format on */
@@ -232,8 +249,20 @@ TEST_F(hierarchy, trace)
          pid_t child, parent;
          int status, err_proc_read;
          int pipe_child[2], pipe_parent[2];
+       int yama_ptrace_scope;
          char buf_parent;
          long ret;
+       bool can_trace_child, can_trace_parent;
+

tools/testing/selftests/landlock/ptrace_test.c TEST_F(hierarchy, trace) · line 266

Quoted 10 lines
tools/testing/selftests/landlock/ptrace_test.c +9 -0
+       yama_ptrace_scope = get_yama_ptrace_scope();
+       ASSERT_LE(0, yama_ptrace_scope);
+
+       if (yama_ptrace_scope >= 3)
+               SKIP(return, "Yama forbids any ptrace use (scope %d)",
+                          yama_ptrace_scope);
+
+       can_trace_child = !variant->domain_parent && (yama_ptrace_scope < 2);
+       can_trace_parent = !variant->domain_child && (yama_ptrace_scope < 1);
 

Unnecessary ( ).

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines

It is difficult to understand the context. yama_ptrace_scope == 2 is YAMA_SCOPE_CAPABILITY, and yama_ptrace_scope == 1 is YAMA_SCOPE_RELATIONAL. I for my part have no idea how that relates to child/parent permissions. Also, I have no idea why the negation (can_trace_child = !variant->domain_parent) is necessary, and what its functional impact might be. Someone else will have to chime in here.

I will copy the definition of the constant definition from yama_lsm.c

Good point.

Quoted 8 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

But I agree this code is difficult to understand, I'm now lost on why we need the negation too.

Hi Mickaël

Can you check the above comment please ?
I also find it difficult to understand how can_trace_child is set.

Quoted 7 lines

On this line:
can_trace_child = !variant->domain_parent &&
yama_ptrace_scope < 2;

it translates to
can_trace_child is true when 1> && 2>
1> when parent process don't have landlock policy

This is because a landlocked process can only trace a process in the same domain or one beneath it. So if a parent process is in its own domain (whereas the child is not, see the diagrams close to the FIXTURE_VARIANT definitions), it should not be able to trace the child.

This check is not new.

Quoted 1 line

2> yama_ptrace_scope = 0 or 1.

A parent can only trace one of its children up to YAMA_SCOPE_RELATIONAL.

Quoted 5 lines

My question is:
When the parent process has a landlock policy, and 2 is true, the parent can also trace the child process, right ? So 1> is not necessary in theory ?

When a parent process *shares* a domain with a child, yes it can trace it. However when a parent process is in a domain not shared with the child, it cannot trace it. This is why there is domain_both, domain_parent and domain_child variants.

Quoted 106 lines

As reference: the latest code (after updating the rest of comments in V7) can be found at patchset 8 of
https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/4084253

Thanks
Jeff

Quoted 98 lines
Quoted 98 lines
Quoted 98 lines
Quoted 10 lines

tools/testing/selftests/landlock/ptrace_test.c TEST_F(hierarchy, trace) · line 290

Quoted 7 lines
tools/testing/selftests/landlock/ptrace_test.c +1 -0
          /*
           * Removes all effective and permitted capabilities to not interfere
@@ -258,6 +287,7 @@ TEST_F(hierarchy, trace)
 
                  ASSERT_EQ(0, close(pipe_parent[1]));
                  ASSERT_EQ(0, close(pipe_child[0]));
+

Unnecessary whitespace change

Quoted 6 lines

tools/testing/selftests/landlock/ptrace_test.c TEST_F(hierarchy, trace) · line 291

Quoted 1 line
tools/testing/selftests/landlock/ptrace_test.c +0 -0
                  if (variant->domain_child)

Why not change this code ?

Quoted 2 lines
tools/testing/selftests/landlock/ptrace_test.c +0 -0
                          create_domain(_metadata);
 

create_domain actually applies the landlocked policy to the (child/parent) process.
This is part of the setup of the testcase, so it is needed.

Quoted 77 lines
Quoted 20 lines
tools/testing/selftests/landlock/ptrace_test.c +2 -2
@@ -267,7 +297,7 @@ TEST_F(hierarchy, trace)
                  /* Tests PTRACE_ATTACH and PTRACE_MODE_READ on the parent. */
                  err_proc_read = test_ptrace_read(parent);
                  ret = ptrace(PTRACE_ATTACH, parent, NULL, 0);
-               if (variant->domain_child) {
+               if (!can_trace_parent) {
                          EXPECT_EQ(-1, ret);
                          EXPECT_EQ(EPERM, errno);
                          EXPECT_EQ(EACCES, err_proc_read);
@@ -283,7 +313,7 @@ TEST_F(hierarchy, trace)
 
                  /* Tests child PTRACE_TRACEME. */
                  ret = ptrace(PTRACE_TRACEME);
-               if (variant->domain_parent) {
+               if (!can_trace_child) {
                          EXPECT_EQ(-1, ret);
                          EXPECT_EQ(EPERM, errno);
                  } else {
@@ -296,12 +326,12 @@ TEST_F(hierarchy, trace)
                   */

tools/testing/selftests/landlock/ptrace_test.c TEST_F(hierarchy, trace) · line 334

Quoted 10 lines
tools/testing/selftests/landlock/ptrace_test.c +2 -2
                  ASSERT_EQ(1, write(pipe_child[1], ".", 1));
 
-               if (!variant->domain_parent) {
+               if (can_trace_child)
                          ASSERT_EQ(0, raise(SIGSTOP));
-               }
 
                  /* Waits for the parent PTRACE_ATTACH test. */
                  ASSERT_EQ(1, read(pipe_parent[0], &buf_child, 1));
+

Unnecessary whitespace change

Quoted 22 lines
tools/testing/selftests/landlock/ptrace_test.c +2 -2
                  _exit(_metadata->passed ? EXIT_SUCCESS : EXIT_FAILURE);
                  return;
          }
@@ -321,7 +351,7 @@ TEST_F(hierarchy, trace)
          ASSERT_EQ(1, read(pipe_child[0], &buf_parent, 1));
 
          /* Tests child PTRACE_TRACEME. */
-       if (!variant->domain_parent) {
+       if (can_trace_child) {
                  ASSERT_EQ(child, waitpid(child, &status, 0));
                  ASSERT_EQ(1, WIFSTOPPED(status));
                  ASSERT_EQ(0, ptrace(PTRACE_DETACH, child, NULL, 0));
@@ -334,7 +364,7 @@ TEST_F(hierarchy, trace)
          /* Tests PTRACE_ATTACH and PTRACE_MODE_READ on the child. */
          err_proc_read = test_ptrace_read(child);
          ret = ptrace(PTRACE_ATTACH, child, NULL, 0);
-       if (variant->domain_parent) {
+       if (!can_trace_child) {
                  EXPECT_EQ(-1, ret);
                  EXPECT_EQ(EPERM, errno);
                  EXPECT_EQ(EACCES, err_proc_read);

tools/testing/selftests/landlock/ptrace_test.c TEST_F(hierarchy, trace) · line 383

Quoted 4 lines
tools/testing/selftests/landlock/ptrace_test.c +1 -0
@@ -350,10 +380,16 @@ TEST_F(hierarchy, trace)
 
          /* Signals that the parent PTRACE_ATTACH test is done. */
          ASSERT_EQ(1, write(pipe_parent[1], ".", 1));
+

Unnecessary whitespace change

Quoted 15 lines
tools/testing/selftests/landlock/ptrace_test.c +5 -1
          ASSERT_EQ(child, waitpid(child, &status, 0));
          if (WIFSIGNALED(status) || !WIFEXITED(status) ||
              WEXITSTATUS(status) != EXIT_SUCCESS)
                  _metadata->passed = 0;
+
+       if (yama_ptrace_scope > 0)
+               SKIP(return,
+                          "Incomplete tests due to Yama restrictions (scope %d)",
+                          yama_ptrace_scope);
   }
 
   TEST_HARNESS_MAIN
--

2.39.0.314.g84b9a713c41-goog

#8 lore raw

Re: [PATCH v4 1/1] selftests/landlock: skip ptrace_test according to YAMA

Quoted 151 lines · Mickaël Salaün
Quoted 103 lines · Jeff Xu
Quoted 102 lines · Mickaël Salaün

Looks good and agree with Guenter's suggestions

Quoted 45 lines · Guenter Roeck
Quoted 35 lines · Jeff Xu

Thanks for the comments.
I agree with most comments, but need Michael to chime in/confirm on below:

Quoted 26 lines · Guenter Roeck
Quoted 15 lines · On Tue, Jan 3, 2023 at 11:03 AM <[email protected]> wrote:

From: Jeff Xu <[email protected]>

Add check for yama setting for ptrace_test.

---
   .../testing/selftests/landlock/ptrace_test.c  | 48 ++++++++++++++++---
   1 file changed, 42 insertions(+), 6 deletions(-)
tools/testing/selftests/landlock/ptrace_test.c +0 -0
index c28ef98ff3ac..379f5ddf6c3f 100644

tools/testing/selftests/landlock/ptrace_test.c static int test_ptrace_read(const pid_t pid) · line 65

Quoted 6 lines
tools/testing/selftests/landlock/ptrace_test.c +3 -0
@@ -60,6 +60,23 @@ static int test_ptrace_read(const pid_t pid)
          return 0;
   }
 
+static int get_yama_ptrace_scope(void)
+{
+       int ret = -1;

Unnecessary initialization

Quoted 4 lines

tools/testing/selftests/landlock/ptrace_test.c static int test_ptrace_read(const pid_t pid) · line 66

Quoted 1 line
tools/testing/selftests/landlock/ptrace_test.c +1 -0
+       char buf[2] = {};

Unnecessary initialization

Quoted 8 lines

buf was used later by atoi(), and atoi needs a string, because the function only reads one byte in read(),
so it needs to add buf[1] = '\0'. In V2, there was a comment to change the buf[1] = '\0' to char buf[2] = {},
my understanding is that the compiler is smart enough and will optimize the initialization to write 0 on the
memory (since this is char and length is 2, and less then the size of int)

Quoted 3 lines

Good point.

Guenter

Looks good to me with the other suggestions applied.

Quoted 46 lines
Quoted 46 lines
Quoted 46 lines

tools/testing/selftests/landlock/ptrace_test.c static int test_ptrace_read(const pid_t pid) · line 72

Quoted 7 lines
tools/testing/selftests/landlock/ptrace_test.c +6 -0
+       int fd = open("/proc/sys/kernel/yama/ptrace_scope", O_RDONLY);
+
+       if (fd < 0)
+               return 0;
+
+       if (read(fd, &buf, 1) < 0)

buf is an array, & is thus unnecessary. Also, if the file is empty, the return value would be 0.

tools/testing/selftests/landlock/ptrace_test.c static int test_ptrace_read(const pid_t pid) · line 73

Quoted 1 line
tools/testing/selftests/landlock/ptrace_test.c +1 -0
+               return -1;

leaking file descriptor

Quoted 18 lines
tools/testing/selftests/landlock/ptrace_test.c +9 -0
+
+       ret = atoi(buf);
+       close(fd);
+       return ret;
+}
+
   /* clang-format off */
   FIXTURE(hierarchy) {};
   /* clang-format on */
@@ -232,8 +249,20 @@ TEST_F(hierarchy, trace)
          pid_t child, parent;
          int status, err_proc_read;
          int pipe_child[2], pipe_parent[2];
+       int yama_ptrace_scope;
          char buf_parent;
          long ret;
+       bool can_trace_child, can_trace_parent;
+

tools/testing/selftests/landlock/ptrace_test.c TEST_F(hierarchy, trace) · line 266

Quoted 10 lines
tools/testing/selftests/landlock/ptrace_test.c +9 -0
+       yama_ptrace_scope = get_yama_ptrace_scope();
+       ASSERT_LE(0, yama_ptrace_scope);
+
+       if (yama_ptrace_scope >= 3)
+               SKIP(return, "Yama forbids any ptrace use (scope %d)",
+                          yama_ptrace_scope);
+
+       can_trace_child = !variant->domain_parent && (yama_ptrace_scope < 2);
+       can_trace_parent = !variant->domain_child && (yama_ptrace_scope < 1);
 

Unnecessary ( ).

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 7 lines

It is difficult to understand the context. yama_ptrace_scope == 2 is YAMA_SCOPE_CAPABILITY, and yama_ptrace_scope == 1 is YAMA_SCOPE_RELATIONAL. I for my part have no idea how that relates to child/parent permissions. Also, I have no idea why the negation (can_trace_child = !variant->domain_parent) is necessary, and what its functional impact might be. Someone else will have to chime in here.

I will copy the definition of the constant definition from yama_lsm.c

Good point.

Quoted 8 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

But I agree this code is difficult to understand, I'm now lost on why we need the negation too.

Hi Mickaël

Can you check the above comment please ?
I also find it difficult to understand how can_trace_child is set.

Quoted 7 lines

On this line:
can_trace_child = !variant->domain_parent &&
yama_ptrace_scope < 2;

it translates to
can_trace_child is true when 1> && 2>
1> when parent process don't have landlock policy

This is because a landlocked process can only trace a process in the same domain or one beneath it. So if a parent process is in its own domain (whereas the child is not, see the diagrams close to the FIXTURE_VARIANT definitions), it should not be able to trace the child.

This check is not new.

Quoted 1 line

2> yama_ptrace_scope = 0 or 1.

A parent can only trace one of its children up to YAMA_SCOPE_RELATIONAL.

Quoted 5 lines

My question is:
When the parent process has a landlock policy, and 2 is true, the parent can also trace the child process, right ? So 1> is not necessary in theory ?

Quoted 5 lines

When a parent process *shares* a domain with a child, yes it can trace it. However when a parent process is in a domain not shared with the child, it cannot trace it. This is why there is domain_both, domain_parent and domain_child variants.

Thanks for clarification.
I'm adding below comments to help readers:

can_trace_child: if a parent process can trace its child process. There are two conditions concerning landlock:
1> the parent and child processes are in the same landlock domain or
one beneath it (case: domain_both = true).
2> yama allows tracing children (up to YAMA_SCOPE_RELATIONAL). Both 1 and 2 need to be met for can_trace_child to be true. If a parent process has its own domain not shared with the child process (case:domain_parent = true), then the parent can't trace the child.

can_trace_parent: if a child process can trace its parent process. There are two conditions concerning landlock:
1> the parent and child process are in the same landlock domain or
one beneath it.(case: domain_both = true).
2> yama is disabled (YAMA_SCOPE_DISABLED).
Both 1 and 2 need to be met for can_trace_parent to be true. If a child process has its own domain not shared with the parent process (case:domain_child = true, then the child can't trace the parent.

Quoted 107 lines
Quoted 107 lines

As reference: the latest code (after updating the rest of comments in V7) can be found at patchset 8 of
https://chromium-review.googlesource.com/c/chromiumos/third_party/kernel/+/4084253

Thanks
Jeff

Quoted 98 lines
Quoted 98 lines
Quoted 98 lines
Quoted 10 lines

tools/testing/selftests/landlock/ptrace_test.c TEST_F(hierarchy, trace) · line 290

Quoted 7 lines
tools/testing/selftests/landlock/ptrace_test.c +1 -0
          /*
           * Removes all effective and permitted capabilities to not interfere
@@ -258,6 +287,7 @@ TEST_F(hierarchy, trace)
 
                  ASSERT_EQ(0, close(pipe_parent[1]));
                  ASSERT_EQ(0, close(pipe_child[0]));
+

Unnecessary whitespace change

Quoted 6 lines

tools/testing/selftests/landlock/ptrace_test.c TEST_F(hierarchy, trace) · line 291

Quoted 1 line
tools/testing/selftests/landlock/ptrace_test.c +0 -0
                  if (variant->domain_child)

Why not change this code ?

Quoted 2 lines
tools/testing/selftests/landlock/ptrace_test.c +0 -0
                          create_domain(_metadata);
 

create_domain actually applies the landlocked policy to the (child/parent) process.
This is part of the setup of the testcase, so it is needed.

Quoted 77 lines
Quoted 20 lines
tools/testing/selftests/landlock/ptrace_test.c +2 -2
@@ -267,7 +297,7 @@ TEST_F(hierarchy, trace)
                  /* Tests PTRACE_ATTACH and PTRACE_MODE_READ on the parent. */
                  err_proc_read = test_ptrace_read(parent);
                  ret = ptrace(PTRACE_ATTACH, parent, NULL, 0);
-               if (variant->domain_child) {
+               if (!can_trace_parent) {
                          EXPECT_EQ(-1, ret);
                          EXPECT_EQ(EPERM, errno);
                          EXPECT_EQ(EACCES, err_proc_read);
@@ -283,7 +313,7 @@ TEST_F(hierarchy, trace)
 
                  /* Tests child PTRACE_TRACEME. */
                  ret = ptrace(PTRACE_TRACEME);
-               if (variant->domain_parent) {
+               if (!can_trace_child) {
                          EXPECT_EQ(-1, ret);
                          EXPECT_EQ(EPERM, errno);
                  } else {
@@ -296,12 +326,12 @@ TEST_F(hierarchy, trace)
                   */

tools/testing/selftests/landlock/ptrace_test.c TEST_F(hierarchy, trace) · line 334

Quoted 10 lines
tools/testing/selftests/landlock/ptrace_test.c +2 -2
                  ASSERT_EQ(1, write(pipe_child[1], ".", 1));
 
-               if (!variant->domain_parent) {
+               if (can_trace_child)
                          ASSERT_EQ(0, raise(SIGSTOP));
-               }
 
                  /* Waits for the parent PTRACE_ATTACH test. */
                  ASSERT_EQ(1, read(pipe_parent[0], &buf_child, 1));
+

Unnecessary whitespace change

Quoted 22 lines
tools/testing/selftests/landlock/ptrace_test.c +2 -2
                  _exit(_metadata->passed ? EXIT_SUCCESS : EXIT_FAILURE);
                  return;
          }
@@ -321,7 +351,7 @@ TEST_F(hierarchy, trace)
          ASSERT_EQ(1, read(pipe_child[0], &buf_parent, 1));
 
          /* Tests child PTRACE_TRACEME. */
-       if (!variant->domain_parent) {
+       if (can_trace_child) {
                  ASSERT_EQ(child, waitpid(child, &status, 0));
                  ASSERT_EQ(1, WIFSTOPPED(status));
                  ASSERT_EQ(0, ptrace(PTRACE_DETACH, child, NULL, 0));
@@ -334,7 +364,7 @@ TEST_F(hierarchy, trace)
          /* Tests PTRACE_ATTACH and PTRACE_MODE_READ on the child. */
          err_proc_read = test_ptrace_read(child);
          ret = ptrace(PTRACE_ATTACH, child, NULL, 0);
-       if (variant->domain_parent) {
+       if (!can_trace_child) {
                  EXPECT_EQ(-1, ret);
                  EXPECT_EQ(EPERM, errno);
                  EXPECT_EQ(EACCES, err_proc_read);

tools/testing/selftests/landlock/ptrace_test.c TEST_F(hierarchy, trace) · line 383

Quoted 4 lines
tools/testing/selftests/landlock/ptrace_test.c +1 -0
@@ -350,10 +380,16 @@ TEST_F(hierarchy, trace)
 
          /* Signals that the parent PTRACE_ATTACH test is done. */
          ASSERT_EQ(1, write(pipe_parent[1], ".", 1));
+

Unnecessary whitespace change

Quoted 15 lines
tools/testing/selftests/landlock/ptrace_test.c +5 -1
          ASSERT_EQ(child, waitpid(child, &status, 0));
          if (WIFSIGNALED(status) || !WIFEXITED(status) ||
              WEXITSTATUS(status) != EXIT_SUCCESS)
                  _metadata->passed = 0;
+
+       if (yama_ptrace_scope > 0)
+               SKIP(return,
+                          "Incomplete tests due to Yama restrictions (scope %d)",
+                          yama_ptrace_scope);
   }
 
   TEST_HARNESS_MAIN
--

2.39.0.314.g84b9a713c41-goog