UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

selftests/seccomp: Handle EINVAL on unshare(CLONE_NEWPID) 

commit ecaaa55c9fa5e8058445a8b891070b12208cdb6d upstream.

unshare(CLONE_NEWPID) can return EINVAL if the kernel does not have the
CONFIG_PID_NS option enabled.

Add a check on these calls to skip the test if we receive EINVAL.

Signed-off-by: Terry Tritton <terry.tritton@linaro.org>
Link: https://lore.kernel.org/r/20240124141357.1243457-2-terry.tritton@linaro.org
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Terry Tritton 2024-01-24 14:13:55 +00:00 committed by Greg Kroah-Hartman
parent f4b1e2cc9f
commit 612fbf6588
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/testing/selftests/seccomp/seccomp_bpf.c
View File

@ -3709,7 +3709,12 @@ TEST(user_notification_sibling_pid_ns)
ASSERT_GE(pid, 0); ASSERT_GE(pid, 0);
if (pid == 0) { if (pid == 0) {
ASSERT_EQ(unshare(CLONE_NEWPID), 0); ASSERT_EQ(unshare(CLONE_NEWPID), 0) {
if (errno == EPERM)
SKIP(return, "CLONE_NEWPID requires CAP_SYS_ADMIN");
else if (errno == EINVAL)
SKIP(return, "CLONE_NEWPID is invalid (missing CONFIG_PID_NS?)");
}
pid2 = fork(); pid2 = fork();
ASSERT_GE(pid2, 0); ASSERT_GE(pid2, 0);
@ -3727,6 +3732,8 @@ TEST(user_notification_sibling_pid_ns)
ASSERT_EQ(unshare(CLONE_NEWPID), 0) { ASSERT_EQ(unshare(CLONE_NEWPID), 0) {
if (errno == EPERM) if (errno == EPERM)
SKIP(return, "CLONE_NEWPID requires CAP_SYS_ADMIN"); SKIP(return, "CLONE_NEWPID requires CAP_SYS_ADMIN");
else if (errno == EINVAL)
SKIP(return, "CLONE_NEWPID is invalid (missing CONFIG_PID_NS?)");
} }
ASSERT_EQ(errno, 0); ASSERT_EQ(errno, 0);