From: jeffxu@chromium.org
To: mic@digikod.net
Cc: jorgelo@chromium.org, keescook@chromium.org,
linux-security-module@vger.kernel.org, groeck@chromium.org,
gnoack@google.com, Jeff Xu <jeffxu@google.com>
Subject: [PATCH v4 1/1] selftests/landlock: skip ptrace_test according to YAMA
Date: Tue, 3 Jan 2023 19:03:14 +0000 [thread overview]
Message-ID: <20230103190314.3882177-2-jeffxu@google.com> (raw)
In-Reply-To: <20230103190314.3882177-1-jeffxu@google.com>
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 | 48 ++++++++++++++++---
1 file changed, 42 insertions(+), 6 deletions(-)
diff --git a/tools/testing/selftests/landlock/ptrace_test.c b/tools/testing/selftests/landlock/ptrace_test.c
index c28ef98ff3ac..379f5ddf6c3f 100644
--- a/tools/testing/selftests/landlock/ptrace_test.c
+++ b/tools/testing/selftests/landlock/ptrace_test.c
@@ -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
--
2.39.0.314.g84b9a713c41-goog
next prev parent reply other threads:[~2023-01-03 19:03 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-03 19:03 [PATCH v4 0/1] selftests/landlock: Fix selftest ptrace_test jeffxu
2023-01-03 19:03 ` jeffxu [this message]
2023-01-03 20:12 ` [PATCH v4 1/1] selftests/landlock: skip ptrace_test according to YAMA Guenter Roeck
2023-01-03 23:49 ` Jeff Xu
2023-01-04 3:40 ` Guenter Roeck
2023-01-09 15:29 ` Mickaël Salaün
2023-01-09 22:50 ` Jeff Xu
2023-01-10 19:04 ` Mickaël Salaün
2023-01-10 20:41 ` Jeff Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230103190314.3882177-2-jeffxu@google.com \
--to=jeffxu@chromium.org \
--cc=gnoack@google.com \
--cc=groeck@chromium.org \
--cc=jeffxu@google.com \
--cc=jorgelo@chromium.org \
--cc=keescook@chromium.org \
--cc=linux-security-module@vger.kernel.org \
--cc=mic@digikod.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).