From: jeffxu@chromium.org
To: mic@digikod.net
Cc: jorgelo@chromium.org, keescook@chromium.org,
linux-security-module@vger.kernel.org, groeck@chromium.org,
Jeff Xu <jeffxu@google.com>
Subject: [PATCH v2 1/1] selftests/landlock: skip ptrace_test according to YAMA
Date: Tue, 13 Dec 2022 18:58:16 +0000 [thread overview]
Message-ID: <20221213185816.3942853-2-jeffxu@chromium.org> (raw)
In-Reply-To: <20221213185816.3942853-1-jeffxu@chromium.org>
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 | 34 +++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/tools/testing/selftests/landlock/ptrace_test.c b/tools/testing/selftests/landlock/ptrace_test.c
index c28ef98ff3ac..8565a25a9587 100644
--- a/tools/testing/selftests/landlock/ptrace_test.c
+++ b/tools/testing/selftests/landlock/ptrace_test.c
@@ -60,6 +60,24 @@ static int test_ptrace_read(const pid_t pid)
return 0;
}
+static int get_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;
+
+ buf[1] = '\0';
+ ret = atoi(buf);
+ close(fd);
+ return ret;
+}
+
/* clang-format off */
FIXTURE(hierarchy) {};
/* clang-format on */
@@ -69,6 +87,7 @@ FIXTURE_VARIANT(hierarchy)
const bool domain_both;
const bool domain_parent;
const bool domain_child;
+ const int yama_value;
};
/*
@@ -93,6 +112,7 @@ FIXTURE_VARIANT_ADD(hierarchy, allow_without_domain) {
.domain_both = false,
.domain_parent = false,
.domain_child = false,
+ .yama_value = 0,
};
/*
@@ -110,6 +130,7 @@ FIXTURE_VARIANT_ADD(hierarchy, allow_with_one_domain) {
.domain_both = false,
.domain_parent = false,
.domain_child = true,
+ .yama_value = 1,
};
/*
@@ -126,6 +147,7 @@ FIXTURE_VARIANT_ADD(hierarchy, deny_with_parent_domain) {
.domain_both = false,
.domain_parent = true,
.domain_child = false,
+ .yama_value = 0,
};
/*
@@ -143,6 +165,7 @@ FIXTURE_VARIANT_ADD(hierarchy, deny_with_sibling_domain) {
.domain_both = false,
.domain_parent = true,
.domain_child = true,
+ .yama_value = 2,
};
/*
@@ -160,6 +183,7 @@ FIXTURE_VARIANT_ADD(hierarchy, allow_sibling_domain) {
.domain_both = true,
.domain_parent = false,
.domain_child = false,
+ .yama_value = 0,
};
/*
@@ -178,6 +202,7 @@ FIXTURE_VARIANT_ADD(hierarchy, allow_with_nested_domain) {
.domain_both = true,
.domain_parent = false,
.domain_child = true,
+ .yama_value = 1,
};
/*
@@ -196,6 +221,7 @@ FIXTURE_VARIANT_ADD(hierarchy, deny_with_nested_and_parent_domain) {
.domain_both = true,
.domain_parent = true,
.domain_child = false,
+ .yama_value = 0,
};
/*
@@ -216,6 +242,7 @@ FIXTURE_VARIANT_ADD(hierarchy, deny_with_forked_domain) {
.domain_both = true,
.domain_parent = true,
.domain_child = true,
+ .yama_value = 2,
};
FIXTURE_SETUP(hierarchy)
@@ -232,9 +259,16 @@ TEST_F(hierarchy, trace)
pid_t child, parent;
int status, err_proc_read;
int pipe_child[2], pipe_parent[2];
+ int yama;
char buf_parent;
long ret;
+ yama = get_ptrace_scope();
+ ASSERT_LE(0, yama);
+
+ if (variant->yama_value < yama)
+ SKIP(return, "unsupported yama value %d", yama);
+
/*
* Removes all effective and permitted capabilities to not interfere
* with cap_ptrace_access_check() in case of PTRACE_MODE_FSCREDS.
--
2.39.0.rc1.256.g54fd8350bd-goog
next prev parent reply other threads:[~2022-12-13 18:58 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-13 18:58 [PATCH v2 0/1] selftests/landlock: Fix selftest ptrace_test run fail jeffxu
2022-12-13 18:58 ` jeffxu [this message]
2022-12-15 18:34 ` [PATCH v2 1/1] selftests/landlock: skip ptrace_test according to YAMA Mickaël Salaün
2022-12-15 20:34 ` Jeff Xu
2022-12-15 20:42 ` Jeff Xu
2022-12-16 10:15 ` Mickaël Salaün
2022-12-16 15:18 ` 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=20221213185816.3942853-2-jeffxu@chromium.org \
--to=jeffxu@chromium.org \
--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).