diff options
| author |   Kees Cook <keescook@chromium.org> | 2020-07-10 10:26:11 -0700 |
|---|---|---|
| committer | Kees Cook <keescook@chromium.org> | 2020-07-10 16:01:45 -0700 |
| commit | d7d2e5bb9f361dc05c7dedd38d4d9269ad8c05e2 (patch) | |
| tree | 2f07573f5c39d2cac6f3e84e845c9fb97c01b6d8 | |
| parent | selftests/seccomp: Rename XFAIL to SKIP (diff) | |
| download | linux-dev-d7d2e5bb9f361dc05c7dedd38d4d9269ad8c05e2.tar.xz linux-dev-d7d2e5bb9f361dc05c7dedd38d4d9269ad8c05e2.zip | |
selftests/seccomp: Add SKIPs for failed unshare()
Running the seccomp tests as a regular user shouldn't just fail tests
that require CAP_SYS_ADMIN (for getting a PID namespace). Instead,
detect those cases and SKIP them. Additionally, gracefully SKIP missing
CONFIG_USER_NS (and add to "config" since we'd prefer to actually test
this case).
Signed-off-by: Kees Cook <keescook@chromium.org>
| -rw-r--r-- | tools/testing/selftests/seccomp/config | 1 | ||||
| -rw-r--r-- | tools/testing/selftests/seccomp/seccomp_bpf.c | 10 |
2 files changed, 9 insertions, 2 deletions
diff --git a/tools/testing/selftests/seccomp/config b/tools/testing/selftests/seccomp/config index db1e11b08c8a..64c19d8eba79 100644 --- a/tools/testing/selftests/seccomp/config +++ b/tools/testing/selftests/seccomp/config @@ -1,2 +1,3 @@ CONFIG_SECCOMP=y CONFIG_SECCOMP_FILTER=y +CONFIG_USER_NS=y diff --git a/tools/testing/selftests/seccomp/seccomp_bpf.c b/tools/testing/selftests/seccomp/seccomp_bpf.c index d4c8858fde8e..80223113f3e3 100644 --- a/tools/testing/selftests/seccomp/seccomp_bpf.c +++ b/tools/testing/selftests/seccomp/seccomp_bpf.c @@ -3444,7 +3444,10 @@ TEST(user_notification_child_pid_ns) struct seccomp_notif req = {}; struct seccomp_notif_resp resp = {}; - ASSERT_EQ(unshare(CLONE_NEWUSER | CLONE_NEWPID), 0); + ASSERT_EQ(unshare(CLONE_NEWUSER | CLONE_NEWPID), 0) { + if (errno == EINVAL) + SKIP(return, "kernel missing CLONE_NEWUSER support"); + }; listener = user_trap_syscall(__NR_getppid, SECCOMP_FILTER_FLAG_NEW_LISTENER); @@ -3509,7 +3512,10 @@ TEST(user_notification_sibling_pid_ns) } /* Create the sibling ns, and sibling in it. */ - ASSERT_EQ(unshare(CLONE_NEWPID), 0); + ASSERT_EQ(unshare(CLONE_NEWPID), 0) { + if (errno == EPERM) + SKIP(return, "CLONE_NEWPID requires CAP_SYS_ADMIN"); + } ASSERT_EQ(errno, 0); pid2 = fork(); |