[PATCH v6 0/1] selftests/landlock: fix ptrace_test

[PATCH v6 0/1] selftests/landlock: fix ptrace_test

[jeffxu]

From: Jeff Xu <jeffxu@google.com>

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

V6:
- Squash change from Mickaël Salaün 
- Link: https://lore.kernel.org/r/20230113175308.50900-1-mic@digikod.net
- Add can_read_child and can_read_parent
- Remove SKIP(), add log for incomplete test.

V5:
- https://lore.kernel.org/all/20230113050755.1277736-1-jeffxu@google.com/
- address comments from groeck@google.com

V4: 
- https://lore.kernel.org/all/20230103190314.3882177-1-jeffxu@google.com
- apply can_trace_parent and can_trace_child to smaller scope.

V3:
https://lore.kernel.org/all/20221227140244.1041292-1-jeffxu@google.com
- add can_trace_parent and can_trace_child to handle yama value.

V2:
https://lore.kernel.org/all/20221213185816.3942853-1-jeffxu@chromium.org
- update from code review comments.

V1:
https://lore.kernel.org/all/20221213185816.3942853-1-jeffxu@chromium.org
- skip specific testcase according to YAMA value

V0: 
https://lore.kernel.org/r/20220628222941.2642917-1-jeffxu@google.com
- 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  | 112 +++++++++++++++---
 1 file changed, 94 insertions(+), 18 deletions(-)


base-commit: 963a70bee5880640d0fd83ed29dc1e7ec0d2bd4a
-- 
2.39.0.314.g84b9a713c41-goog

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

[jeffxu]

From: Jeff Xu <jeffxu@google.com>

Add check for yama setting for ptrace_test.

Signed-off-by: Jeff Xu <jeffxu@google.com>
---
 .../testing/selftests/landlock/ptrace_test.c  | 112 +++++++++++++++---
 1 file changed, 94 insertions(+), 18 deletions(-)

diff --git a/tools/testing/selftests/landlock/ptrace_test.c b/tools/testing/selftests/landlock/ptrace_test.c
index c28ef98ff3ac..4881fa428253 100644
--- a/tools/testing/selftests/landlock/ptrace_test.c
+++ b/tools/testing/selftests/landlock/ptrace_test.c
@@ -19,6 +19,12 @@
 
 #include "common.h"
 
+/* Copied from security/yama/yama_lsm.c */
+#define YAMA_SCOPE_DISABLED 0
+#define YAMA_SCOPE_RELATIONAL 1
+#define YAMA_SCOPE_CAPABILITY 2
+#define YAMA_SCOPE_NO_ATTACH 3
+
 static void create_domain(struct __test_metadata *const _metadata)
 {
 	int ruleset_fd;
@@ -60,6 +66,25 @@ static int test_ptrace_read(const pid_t pid)
 	return 0;
 }
 
+static int get_yama_ptrace_scope(void)
+{
+	int ret;
+	char buf[2] = {};
+	const int fd = open("/proc/sys/kernel/yama/ptrace_scope", O_RDONLY);
+
+	if (fd < 0)
+		return 0;
+
+	if (read(fd, buf, 1) < 0) {
+		close(fd);
+		return -1;
+	}
+
+	ret = atoi(buf);
+	close(fd);
+	return ret;
+}
+
 /* clang-format off */
 FIXTURE(hierarchy) {};
 /* clang-format on */
@@ -232,8 +257,51 @@ 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_read_child, can_trace_child, can_read_parent, can_trace_parent;
+
+	yama_ptrace_scope = get_yama_ptrace_scope();
+	ASSERT_LE(0, yama_ptrace_scope);
+
+	if (yama_ptrace_scope > YAMA_SCOPE_DISABLED)
+		TH_LOG("Incomplete tests due to Yama restrictions (scope %d)",
+		       yama_ptrace_scope);
+
+	/*
+	 * can_read_child is true if a parent process can read its child
+	 * process, which is only the case when the parent process is not
+	 * isolated from the child with a dedicated Landlock domain.
+	 */
+	can_read_child = !variant->domain_parent;
+
+	/*
+	 * can_trace_child is true if a parent process can trace its child
+	 * process.  This depends on two conditions:
+	 * - The parent process is not isolated from the child with a dedicated
+	 *   Landlock domain.
+	 * - Yama allows tracing children (up to YAMA_SCOPE_RELATIONAL).
+	 */
+	can_trace_child = can_read_child &&
+			  yama_ptrace_scope <= YAMA_SCOPE_RELATIONAL;
+
+	/*
+	 * can_read_parent is true if a child process can read its parent
+	 * process, which is only the case when the child process is not
+	 * isolated from the parent with a dedicated Landlock domain.
+	 */
+	can_read_parent = !variant->domain_child;
+
+	/*
+	 * can_trace_parent is true if a child process can trace its parent
+	 * process.  This depends on two conditions:
+	 * - The child process is not isolated from the parent with a dedicated
+	 *   Landlock domain.
+	 * - Yama is disabled (YAMA_SCOPE_DISABLED).
+	 */
+	can_trace_parent = can_read_parent &&
+			   yama_ptrace_scope <= YAMA_SCOPE_DISABLED;
 
 	/*
 	 * Removes all effective and permitted capabilities to not interfere
@@ -264,16 +332,20 @@ TEST_F(hierarchy, trace)
 		/* Waits for the parent to be in a domain, if any. */
 		ASSERT_EQ(1, read(pipe_parent[0], &buf_child, 1));
 
-		/* Tests PTRACE_ATTACH and PTRACE_MODE_READ on the parent. */
+		/* Tests PTRACE_MODE_READ on the parent. */
 		err_proc_read = test_ptrace_read(parent);
+		if (can_read_parent)
+			EXPECT_EQ(0, err_proc_read);
+		else
+			EXPECT_EQ(EACCES, err_proc_read);
+
+		/* Tests PTRACE_ATTACH on the parent. */
 		ret = ptrace(PTRACE_ATTACH, parent, NULL, 0);
-		if (variant->domain_child) {
+		if (can_trace_parent) {
+			EXPECT_EQ(0, ret);
+		} else {
 			EXPECT_EQ(-1, ret);
 			EXPECT_EQ(EPERM, errno);
-			EXPECT_EQ(EACCES, err_proc_read);
-		} else {
-			EXPECT_EQ(0, ret);
-			EXPECT_EQ(0, err_proc_read);
 		}
 		if (ret == 0) {
 			ASSERT_EQ(parent, waitpid(parent, &status, 0));
@@ -283,11 +355,11 @@ TEST_F(hierarchy, trace)
 
 		/* Tests child PTRACE_TRACEME. */
 		ret = ptrace(PTRACE_TRACEME);
-		if (variant->domain_parent) {
+		if (can_trace_child) {
+			EXPECT_EQ(0, ret);
+		} else {
 			EXPECT_EQ(-1, ret);
 			EXPECT_EQ(EPERM, errno);
-		} else {
-			EXPECT_EQ(0, ret);
 		}
 
 		/*
@@ -296,9 +368,8 @@ 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));
@@ -321,7 +392,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));
@@ -331,17 +402,22 @@ TEST_F(hierarchy, trace)
 		EXPECT_EQ(ESRCH, errno);
 	}
 
-	/* Tests PTRACE_ATTACH and PTRACE_MODE_READ on the child. */
+	/* Tests PTRACE_MODE_READ on the child. */
 	err_proc_read = test_ptrace_read(child);
+	if (can_read_child)
+		EXPECT_EQ(0, err_proc_read);
+	else
+		EXPECT_EQ(EACCES, err_proc_read);
+
+	/* Tests PTRACE_ATTACH on the child. */
 	ret = ptrace(PTRACE_ATTACH, child, NULL, 0);
-	if (variant->domain_parent) {
+	if (can_trace_child) {
+		EXPECT_EQ(0, ret);
+	} else {
 		EXPECT_EQ(-1, ret);
 		EXPECT_EQ(EPERM, errno);
-		EXPECT_EQ(EACCES, err_proc_read);
-	} else {
-		EXPECT_EQ(0, ret);
-		EXPECT_EQ(0, err_proc_read);
 	}
+
 	if (ret == 0) {
 		ASSERT_EQ(child, waitpid(child, &status, 0));
 		ASSERT_EQ(1, WIFSTOPPED(status));
-- 
2.39.0.314.g84b9a713c41-goog

Re: [PATCH v6 0/1] selftests/landlock: fix ptrace_test

[Mickaël Salaün]

Thanks, it will soon be in -next: 
https://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git/log/?h=next

On 14/01/2023 03:03, jeffxu@chromium.org wrote:
> From: Jeff Xu <jeffxu@google.com>
> 
> Landlock ptrace failed because YAMA is enabled.
> This patch check YAMA value and skip related tests.
> 
> V6:
> - Squash change from Mickaël Salaün
> - Link: https://lore.kernel.org/r/20230113175308.50900-1-mic@digikod.net
> - Add can_read_child and can_read_parent
> - Remove SKIP(), add log for incomplete test.
> 
> V5:
> - https://lore.kernel.org/all/20230113050755.1277736-1-jeffxu@google.com/
> - address comments from groeck@google.com
> 
> V4:
> - https://lore.kernel.org/all/20230103190314.3882177-1-jeffxu@google.com
> - apply can_trace_parent and can_trace_child to smaller scope.
> 
> V3:
> https://lore.kernel.org/all/20221227140244.1041292-1-jeffxu@google.com
> - add can_trace_parent and can_trace_child to handle yama value.
> 
> V2:
> https://lore.kernel.org/all/20221213185816.3942853-1-jeffxu@chromium.org
> - update from code review comments.
> 
> V1:
> https://lore.kernel.org/all/20221213185816.3942853-1-jeffxu@chromium.org
> - skip specific testcase according to YAMA value
> 
> V0:
> https://lore.kernel.org/r/20220628222941.2642917-1-jeffxu@google.com
> - 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  | 112 +++++++++++++++---
>   1 file changed, 94 insertions(+), 18 deletions(-)
> 
> 
> base-commit: 963a70bee5880640d0fd83ed29dc1e7ec0d2bd4a

Re: [PATCH v6 0/1] selftests/landlock: fix ptrace_test

[Jeff Xu]

Awesome, thanks!

On Fri, Jan 27, 2023 at 10:00 AM Mickaël Salaün <mic@digikod.net> wrote:
>
> Thanks, it will soon be in -next:
> https://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git/log/?h=next
>
> On 14/01/2023 03:03, jeffxu@chromium.org wrote:
> > From: Jeff Xu <jeffxu@google.com>
> >
> > Landlock ptrace failed because YAMA is enabled.
> > This patch check YAMA value and skip related tests.
> >
> > V6:
> > - Squash change from Mickaël Salaün
> > - Link: https://lore.kernel.org/r/20230113175308.50900-1-mic@digikod.net
> > - Add can_read_child and can_read_parent
> > - Remove SKIP(), add log for incomplete test.
> >
> > V5:
> > - https://lore.kernel.org/all/20230113050755.1277736-1-jeffxu@google.com/
> > - address comments from groeck@google.com
> >
> > V4:
> > - https://lore.kernel.org/all/20230103190314.3882177-1-jeffxu@google.com
> > - apply can_trace_parent and can_trace_child to smaller scope.
> >
> > V3:
> > https://lore.kernel.org/all/20221227140244.1041292-1-jeffxu@google.com
> > - add can_trace_parent and can_trace_child to handle yama value.
> >
> > V2:
> > https://lore.kernel.org/all/20221213185816.3942853-1-jeffxu@chromium.org
> > - update from code review comments.
> >
> > V1:
> > https://lore.kernel.org/all/20221213185816.3942853-1-jeffxu@chromium.org
> > - skip specific testcase according to YAMA value
> >
> > V0:
> > https://lore.kernel.org/r/20220628222941.2642917-1-jeffxu@google.com
> > - 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  | 112 +++++++++++++++---
> >   1 file changed, 94 insertions(+), 18 deletions(-)
> >
> >
> > base-commit: 963a70bee5880640d0fd83ed29dc1e7ec0d2bd4a