linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Tycho Andersen <tycho@tycho.ws>
To: Shuah Khan <shuah@kernel.org>, Kees Cook <keescook@chromium.org>
Cc: linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org,
	Tycho Andersen <tycho@tycho.ws>
Subject: [PATCH 4/6] selftests: skip seccomp get_metadata test if not real root
Date: Fri, 18 Jan 2019 17:12:15 -0700	[thread overview]
Message-ID: <20190119001217.12660-5-tycho@tycho.ws> (raw)
In-Reply-To: <20190119001217.12660-1-tycho@tycho.ws>

The get_metadata() test requires real root, so let's skip it if we're not
real root.

Note that I used XFAIL here because that's what the test does later if
CONFIG_CHEKCKPOINT_RESTORE happens to not be enabled. After looking at the
code, there doesn't seem to be a nice way to skip tests defined as TEST(),
since there's no return code (I tried exit(KSFT_SKIP), but that didn't work
either...). So let's do it this way to be consistent, and easier to fix
when someone comes along and fixes it.

Signed-off-by: Tycho Andersen <tycho@tycho.ws>
---
 tools/testing/selftests/seccomp/seccomp_bpf.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tools/testing/selftests/seccomp/seccomp_bpf.c b/tools/testing/selftests/seccomp/seccomp_bpf.c
index 912a2a5430dc..ab6b6620f522 100644
--- a/tools/testing/selftests/seccomp/seccomp_bpf.c
+++ b/tools/testing/selftests/seccomp/seccomp_bpf.c
@@ -2929,6 +2929,12 @@ TEST(get_metadata)
 	struct seccomp_metadata md;
 	long ret;
 
+	/* Only real root can get metadata. */
+	if (geteuid()) {
+		XFAIL(return, "get_metadata requires real root");
+		return;
+	}
+
 	ASSERT_EQ(0, pipe(pipefd));
 
 	pid = fork();
-- 
2.19.1


  parent reply	other threads:[~2019-01-19  0:13 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-19  0:12 [PATCH v1 0/6] seccomp test fixes Tycho Andersen
2019-01-19  0:12 ` [PATCH 1/6] selftests: don't kill child immediately in get_metadata() test Tycho Andersen
2019-01-19  0:12 ` [PATCH 2/6] selftests: fix typo in seccomp_bpf.c Tycho Andersen
2019-01-19  0:12 ` [PATCH 3/6] selftest: include stdio.h in kselftest.h Tycho Andersen
2019-01-19  0:12 ` Tycho Andersen [this message]
2019-01-19  0:12 ` [PATCH 5/6] selftests: set NO_NEW_PRIVS bit in seccomp user tests Tycho Andersen
2019-01-19  0:12 ` [PATCH 6/6] selftests: unshare userns in seccomp pidns testcases Tycho Andersen
2019-01-20  0:43 ` [PATCH v1 0/6] seccomp test fixes Kees Cook
2019-01-20 19:28   ` shuah

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=20190119001217.12660-5-tycho@tycho.ws \
    --to=tycho@tycho.ws \
    --cc=keescook@chromium.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=shuah@kernel.org \
    /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).