From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Micka=C3=ABl=20Sala=C3=BCn?= Subject: [RFC v1 10/17] selftest/seccomp: Add field_is_valid_syscall test Date: Thu, 24 Mar 2016 03:53:55 +0100 Message-ID: <1458788042-26173-2-git-send-email-mic@digikod.net> References: <1458784008-16277-1-git-send-email-mic@digikod.net> <1458788042-26173-1-git-send-email-mic@digikod.net> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <1458788042-26173-1-git-send-email-mic-WFhQfpSGs3bR7s880joybQ@public.gmane.org> Sender: linux-api-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: linux-security-module-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: =?UTF-8?q?Micka=C3=ABl=20Sala=C3=BCn?= , Andreas Gruenbacher , Andy Lutomirski , Andy Lutomirski , Arnd Bergmann , Casey Schaufler , Daniel Borkmann , David Drysdale , Eric Paris , James Morris , Jeff Dike , Julien Tinnes , Kees Cook , Michael Kerrisk , Paul Moore , Richard Weinberger , "Serge E . Hallyn" , Stephen Smalley , Tetsuo Handa , Will Drewry , linux-api-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, kernel-hardening-ZwoEplunGu1jrUoiu81ncdBPR1lH4CV8@public.gmane.org List-Id: linux-api@vger.kernel.org Test the new seccomp_data field: is_valid_syscall. Signed-off-by: Micka=C3=ABl Sala=C3=BCn Cc: Andy Lutomirski Cc: Kees Cook Cc: Paul Moore Cc: Will Drewry --- tools/testing/selftests/seccomp/seccomp_bpf.c | 31 +++++++++++++++++++= ++++++++ 1 file changed, 31 insertions(+) diff --git a/tools/testing/selftests/seccomp/seccomp_bpf.c b/tools/test= ing/selftests/seccomp/seccomp_bpf.c index edaa405111aa..8b1a6bfc64a1 100644 --- a/tools/testing/selftests/seccomp/seccomp_bpf.c +++ b/tools/testing/selftests/seccomp/seccomp_bpf.c @@ -2208,6 +2208,37 @@ TEST(syscall_restart) _metadata->passed =3D 0; } =20 +#ifdef SECCOMP_DATA_ARGEVAL_PRESENT +TEST(field_is_valid_syscall) +{ + struct sock_filter filter[] =3D { + BPF_STMT(BPF_LD|BPF_W|BPF_ABS, + offsetof(struct seccomp_data, nr)), + BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, __NR_getpid, 1, 0), + BPF_STMT(BPF_RET|BPF_K, SECCOMP_RET_ALLOW), + BPF_STMT(BPF_LD|BPF_W|BPF_ABS, + offsetof(struct seccomp_data, is_valid_syscall)), + BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, 1, 1, 0), + BPF_STMT(BPF_RET|BPF_K, SECCOMP_RET_ERRNO | EINVAL), + BPF_STMT(BPF_RET|BPF_K, SECCOMP_RET_ALLOW), + }; + struct sock_fprog prog =3D { + .len =3D (unsigned short)ARRAY_SIZE(filter), + .filter =3D filter, + }; + + ASSERT_EQ(0, prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0)) { + TH_LOG("Kernel does not support PR_SET_NO_NEW_PRIVS!"); + } + EXPECT_EQ(0, seccomp(SECCOMP_SET_MODE_FILTER, 0, &prog)) { + TH_LOG("Failed to install filter!"); + } + + EXPECT_EQ(-1, syscall(__NR_getpid)); + EXPECT_EQ(EINVAL, errno); +} +#endif /* SECCOMP_DATA_ARGEVAL_PRESENT */ + /* * TODO: * - add microbenchmarks --=20 2.8.0.rc3 From mboxrd@z Thu Jan 1 00:00:00 1970 Reply-To: kernel-hardening@lists.openwall.com From: =?UTF-8?q?Micka=C3=ABl=20Sala=C3=BCn?= Date: Thu, 24 Mar 2016 03:53:55 +0100 Message-Id: <1458788042-26173-2-git-send-email-mic@digikod.net> In-Reply-To: <1458788042-26173-1-git-send-email-mic@digikod.net> References: <1458784008-16277-1-git-send-email-mic@digikod.net> <1458788042-26173-1-git-send-email-mic@digikod.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [kernel-hardening] [RFC v1 10/17] selftest/seccomp: Add field_is_valid_syscall test To: linux-security-module@vger.kernel.org Cc: =?UTF-8?q?Micka=C3=ABl=20Sala=C3=BCn?= , Andreas Gruenbacher , Andy Lutomirski , Andy Lutomirski , Arnd Bergmann , Casey Schaufler , Daniel Borkmann , David Drysdale , Eric Paris , James Morris , Jeff Dike , Julien Tinnes , Kees Cook , Michael Kerrisk , Paul Moore , Richard Weinberger , "Serge E . Hallyn" , Stephen Smalley , Tetsuo Handa , Will Drewry , linux-api@vger.kernel.org, kernel-hardening@lists.openwall.com List-ID: Test the new seccomp_data field: is_valid_syscall. Signed-off-by: Mickaël Salaün Cc: Andy Lutomirski Cc: Kees Cook Cc: Paul Moore Cc: Will Drewry --- tools/testing/selftests/seccomp/seccomp_bpf.c | 31 +++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/tools/testing/selftests/seccomp/seccomp_bpf.c b/tools/testing/selftests/seccomp/seccomp_bpf.c index edaa405111aa..8b1a6bfc64a1 100644 --- a/tools/testing/selftests/seccomp/seccomp_bpf.c +++ b/tools/testing/selftests/seccomp/seccomp_bpf.c @@ -2208,6 +2208,37 @@ TEST(syscall_restart) _metadata->passed = 0; } +#ifdef SECCOMP_DATA_ARGEVAL_PRESENT +TEST(field_is_valid_syscall) +{ + struct sock_filter filter[] = { + BPF_STMT(BPF_LD|BPF_W|BPF_ABS, + offsetof(struct seccomp_data, nr)), + BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, __NR_getpid, 1, 0), + BPF_STMT(BPF_RET|BPF_K, SECCOMP_RET_ALLOW), + BPF_STMT(BPF_LD|BPF_W|BPF_ABS, + offsetof(struct seccomp_data, is_valid_syscall)), + BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, 1, 1, 0), + BPF_STMT(BPF_RET|BPF_K, SECCOMP_RET_ERRNO | EINVAL), + BPF_STMT(BPF_RET|BPF_K, SECCOMP_RET_ALLOW), + }; + struct sock_fprog prog = { + .len = (unsigned short)ARRAY_SIZE(filter), + .filter = filter, + }; + + ASSERT_EQ(0, prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0)) { + TH_LOG("Kernel does not support PR_SET_NO_NEW_PRIVS!"); + } + EXPECT_EQ(0, seccomp(SECCOMP_SET_MODE_FILTER, 0, &prog)) { + TH_LOG("Failed to install filter!"); + } + + EXPECT_EQ(-1, syscall(__NR_getpid)); + EXPECT_EQ(EINVAL, errno); +} +#endif /* SECCOMP_DATA_ARGEVAL_PRESENT */ + /* * TODO: * - add microbenchmarks -- 2.8.0.rc3