[RFC v1 09/17] selftest/seccomp: Extend seccomp_data until matches[6]
From: Mickaël Salaün <hidden>
Date: 2016-03-24 02:53:54
Subsystem:
kernel selftest framework, secure computing, the rest · Maintainers:
Shuah Khan, Shuah Khan, Kees Cook, Linus Torvalds
Signed-off-by: Mickaël Salaün <redacted> Cc: Andy Lutomirski <redacted> Cc: Kees Cook <redacted> Cc: Paul Moore <redacted> Cc: Will Drewry <redacted> --- tools/testing/selftests/seccomp/seccomp_bpf.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
diff --git a/tools/testing/selftests/seccomp/seccomp_bpf.c b/tools/testing/selftests/seccomp/seccomp_bpf.c
index 023717bf3185..edaa405111aa 100644
--- a/tools/testing/selftests/seccomp/seccomp_bpf.c
+++ b/tools/testing/selftests/seccomp/seccomp_bpf.c@@ -84,13 +84,21 @@ struct seccomp_data { __u32 arch; __u64 instruction_pointer; __u64 args[6]; + __u32 is_valid_syscall; /* SECCOMP_DATA_VALIDSYS_PRESENT */ + __u32 checker_group; /* SECCOMP_DATA_ARGEVAL_PRESENT */ + __u64 arg_matches[6]; /* SECCOMP_DATA_ARGEVAL_PRESENT */ }; + +#define SECCOMP_DATA_ARGEVAL_PRESENT #endif #if __BYTE_ORDER == __LITTLE_ENDIAN #define syscall_arg(_n) (offsetof(struct seccomp_data, args[_n])) +#define match_arg(_n) (offsetof(struct seccomp_data, arg_matches[_n])) #elif __BYTE_ORDER == __BIG_ENDIAN #define syscall_arg(_n) (offsetof(struct seccomp_data, args[_n]) + sizeof(__u32)) +#define match_arg(_n) \ + (offsetof(struct seccomp_data, arg_matches[_n]) + sizeof(__u32)) #else #error "wut? Unknown __BYTE_ORDER?!" #endif
@@ -502,7 +510,11 @@ TEST_SIGNAL(KILL_one_arg_six, SIGSYS) TEST(arg_out_of_range) { struct sock_filter filter[] = { +#ifdef SECCOMP_DATA_ARGEVAL_PRESENT + BPF_STMT(BPF_LD|BPF_W|BPF_ABS, match_arg(6)), +#else BPF_STMT(BPF_LD|BPF_W|BPF_ABS, syscall_arg(6)), +#endif BPF_STMT(BPF_RET|BPF_K, SECCOMP_RET_ALLOW), }; struct sock_fprog prog = {
--
2.8.0.rc3