selftests/seccomp: Be more precise with syscall arguments.
Subsystems (2)
PATCH 1/1 selftests/seccomp: Be more precise with syscall arguments.
Certain syscall emulation layers strictly check that the number of arguments match what the syscall handler expects. The KILL_one_arg_one and KILL_one_arg_six tests passed more parameters than expected to various syscalls, causing failures in this emulation mode. Instead, test using syscalls that take the appropriate number of arguments.
--- tools/testing/selftests/seccomp/seccomp_bpf.c | 46 ++++++++++++++++++++------- 1 file changed, 35 insertions(+), 11 deletions(-)
tools/testing/selftests/seccomp/seccomp_bpf.c +35 -11
@@ -29,6 +29,9 @@#include <linux/elf.h> #include <sys/uio.h> #include <sys/utsname.h> +#include <sys/fcntl.h> +#include <sys/mman.h> +#include <sys/times.h> #define _GNU_SOURCE#include <unistd.h>
@@ -429,14 +432,16 @@ TEST_SIGNAL(KILL_one, SIGSYS) TEST_SIGNAL(KILL_one_arg_one, SIGSYS) { +void *fatal_address;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_JUMP (BPF_JMP |BPF_JEQ |BPF_K , __NR_times,1 ,0 ),BPF_STMT (BPF_RET |BPF_K ,SECCOMP_RET_ALLOW ),/* Only both with lower 32-bit for now. */ BPF_STMT (BPF_LD |BPF_W |BPF_ABS ,syscall_arg (0 )), -BPF_JUMP (BPF_JMP |BPF_JEQ |BPF_K ,0x0C0FFEE ,0 ,1 ), +BPF_JUMP (BPF_JMP |BPF_JEQ |BPF_K , + (unsigned long )&fatal_address,0 ,1 ),BPF_STMT (BPF_RET |BPF_K ,SECCOMP_RET_KILL ),BPF_STMT (BPF_RET |BPF_K ,SECCOMP_RET_ALLOW ), };
@@ -446,7 +451,8 @@ TEST_SIGNAL(KILL_one_arg_one, SIGSYS) };long ret;pid_t parent =getppid (); -pid_t pid =getpid (); +struct tms timebuf; +clock_t clock =times (&timebuf); ret =prctl (PR_SET_NO_NEW_PRIVS ,1 ,0 ,0 ,0 );ASSERT_EQ (0 , ret);
@@ -455,17 +461,22 @@ TEST_SIGNAL(KILL_one_arg_one, SIGSYS)ASSERT_EQ (0 , ret);EXPECT_EQ (parent,syscall (__NR_getppid)); -EXPECT_EQ (pid,syscall (__NR_getpid)); -/* getpid() should never return. */ -EXPECT_EQ (0 ,syscall (__NR_getpid,0x0C0FFEE )); +EXPECT_LE (clock,syscall (__NR_times, &timebuf)); +/* times() should never return. */ +EXPECT_EQ (0 ,syscall (__NR_times, &fatal_address)); } TEST_SIGNAL(KILL_one_arg_six, SIGSYS) { +#ifndef __NR_mmap2 +int sysno = __NR_mmap; +#else +int sysno = __NR_mmap2; +#endif 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_JUMP (BPF_JMP |BPF_JEQ |BPF_K , sysno,1 ,0 ),BPF_STMT (BPF_RET |BPF_K ,SECCOMP_RET_ALLOW ),/* Only both with lower 32-bit for now. */ BPF_STMT (BPF_LD |BPF_W |BPF_ABS ,syscall_arg (5 )),
@@ -479,7 +490,8 @@ TEST_SIGNAL(KILL_one_arg_six, SIGSYS) };long ret;pid_t parent =getppid (); -pid_t pid =getpid (); +int fd; +void *map1, *map2; ret =prctl (PR_SET_NO_NEW_PRIVS ,1 ,0 ,0 ,0 );ASSERT_EQ (0 , ret);
@@ -487,10 +499,22 @@ TEST_SIGNAL(KILL_one_arg_six, SIGSYS) ret =prctl (PR_SET_SECCOMP ,SECCOMP_MODE_FILTER , &prog);ASSERT_EQ (0 , ret); + fd =open ("/dev/zero" ,O_RDONLY ); +ASSERT_NE (-1 , fd); +EXPECT_EQ (parent,syscall (__NR_getppid)); -EXPECT_EQ (pid,syscall (__NR_getpid)); -/* getpid() should never return. */ -EXPECT_EQ (0 ,syscall (__NR_getpid,1 ,2 ,3 ,4 ,5 ,0x0C0FFEE )); + map1 = (void *)syscall (sysno, +NULL ,PAGE_SIZE ,PROT_READ ,MAP_PRIVATE , fd,PAGE_SIZE ); +EXPECT_NE (MAP_FAILED , map1); +/* mmap2() should never return. */ + map2 = (void *)syscall (sysno, +NULL ,PAGE_SIZE ,PROT_READ ,MAP_PRIVATE , fd,0x0C0FFEE ); +EXPECT_EQ (MAP_FAILED , map2); + +/* The test failed, so clean up the resources. */ +munmap (map1,PAGE_SIZE ); +munmap (map2,PAGE_SIZE ); +close (fd); }/* TODO(wad) add 64-bit versus 32-bit arg tests. */
Signature · 1 line
2.6.0.rc2.230.g3dd15c0
Quoted 7 lines · Robert Sesek
Certain syscall emulation layers strictly check that the number of arguments match what the syscall handler expects. The
KILL_one_arg_oneandKILL_one_arg_sixtests passed more parameters than expected to various syscalls, causing failures in this emulation mode. Instead, test using syscalls that take the appropriate number of arguments.Signed-off-by Robert Sesek <[email protected]>
Looks great, thanks!
Shuah, can you take this into the selftests tree?
-Kees
Quoted 113 lines
--- tools/testing/selftests/seccomp/seccomp_bpf.c | 46 ++++++++++++++++++++------- 1 file changed, 35 insertions(+), 11 deletions(-)tools/testing/selftests/seccomp/seccomp_bpf.c +35
-12@@ -29,6 +29,9 @@#include <linux/elf.h> #include <sys/uio.h> #include <sys/utsname.h> +#include <sys/fcntl.h> +#include <sys/mman.h> +#include <sys/times.h> #define _GNU_SOURCE#include <unistd.h> @@ -429,14 +432,16 @@ TEST_SIGNAL(KILL_one, SIGSYS) TEST_SIGNAL(KILL_one_arg_one, SIGSYS) { +void *fatal_address;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_JUMP (BPF_JMP |BPF_JEQ |BPF_K , __NR_times,1 ,0 ),BPF_STMT (BPF_RET |BPF_K ,SECCOMP_RET_ALLOW ),/* Only both with lower 32-bit for now. */ BPF_STMT (BPF_LD |BPF_W |BPF_ABS ,syscall_arg (0 )), -BPF_JUMP (BPF_JMP |BPF_JEQ |BPF_K ,0x0C0FFEE ,0 ,1 ), +BPF_JUMP (BPF_JMP |BPF_JEQ |BPF_K , + (unsigned long )&fatal_address,0 ,1 ),BPF_STMT (BPF_RET |BPF_K ,SECCOMP_RET_KILL ),BPF_STMT (BPF_RET |BPF_K ,SECCOMP_RET_ALLOW ), };@@ -446,7 +451,8 @@ TEST_SIGNAL(KILL_one_arg_one, SIGSYS) };long ret;pid_t parent =getppid (); -pid_t pid =getpid (); +struct tms timebuf; +clock_t clock =times (&timebuf); ret =prctl (PR_SET_NO_NEW_PRIVS ,1 ,0 ,0 ,0 );ASSERT_EQ (0 , ret);@@ -455,17 +461,22 @@ TEST_SIGNAL(KILL_one_arg_one, SIGSYS)ASSERT_EQ (0 , ret);EXPECT_EQ (parent,syscall (__NR_getppid)); -EXPECT_EQ (pid,syscall (__NR_getpid)); -/* getpid() should never return. */ -EXPECT_EQ (0 ,syscall (__NR_getpid,0x0C0FFEE )); +EXPECT_LE (clock,syscall (__NR_times, &timebuf)); +/* times() should never return. */ +EXPECT_EQ (0 ,syscall (__NR_times, &fatal_address)); } TEST_SIGNAL(KILL_one_arg_six, SIGSYS) { +#ifndef __NR_mmap2 +int sysno = __NR_mmap; +#else +int sysno = __NR_mmap2; +#endif 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_JUMP (BPF_JMP |BPF_JEQ |BPF_K , sysno,1 ,0 ),BPF_STMT (BPF_RET |BPF_K ,SECCOMP_RET_ALLOW ),/* Only both with lower 32-bit for now. */ BPF_STMT (BPF_LD |BPF_W |BPF_ABS ,syscall_arg (5 )),@@ -479,7 +490,8 @@ TEST_SIGNAL(KILL_one_arg_six, SIGSYS) };long ret;pid_t parent =getppid (); -pid_t pid =getpid (); +int fd; +void *map1, *map2; ret =prctl (PR_SET_NO_NEW_PRIVS ,1 ,0 ,0 ,0 );ASSERT_EQ (0 , ret);@@ -487,10 +499,22 @@ TEST_SIGNAL(KILL_one_arg_six, SIGSYS) ret =prctl (PR_SET_SECCOMP ,SECCOMP_MODE_FILTER , &prog);ASSERT_EQ (0 , ret); + fd =open ("/dev/zero" ,O_RDONLY ); +ASSERT_NE (-1 , fd); +EXPECT_EQ (parent,syscall (__NR_getppid)); -EXPECT_EQ (pid,syscall (__NR_getpid)); -/* getpid() should never return. */ -EXPECT_EQ (0 ,syscall (__NR_getpid,1 ,2 ,3 ,4 ,5 ,0x0C0FFEE )); + map1 = (void *)syscall (sysno, +NULL ,PAGE_SIZE ,PROT_READ ,MAP_PRIVATE , fd,PAGE_SIZE ); +EXPECT_NE (MAP_FAILED , map1); +/* mmap2() should never return. */ + map2 = (void *)syscall (sysno, +NULL ,PAGE_SIZE ,PROT_READ ,MAP_PRIVATE , fd,0x0C0FFEE ); +EXPECT_EQ (MAP_FAILED , map2); + +/* The test failed, so clean up the resources. */ +munmap (map1,PAGE_SIZE ); +munmap (map2,PAGE_SIZE ); +close (fd); }/* TODO(wad) add 64-bit versus 32-bit arg tests. */ --2.6.0.rc2.230.g3dd15c0
Signature · 2 lines
Kees Cook Chrome OS Security
Quoted 7 lines · Kees Cook
Quoted 6 lines · Robert Sesek
Certain syscall emulation layers strictly check that the number of arguments match what the syscall handler expects. The
KILL_one_arg_oneandKILL_one_arg_sixtests passed more parameters than expected to various syscalls, causing failures in this emulation mode. Instead, test using syscalls that take the appropriate number of arguments.
Quoted 8 lines
Quoted 1 line
Signed-off-by Robert Sesek <[email protected]>Signed-off-by Kees Cook <[email protected]>Looks great, thanks!
Shuah, can you take this into the selftests tree?
Robert,
Could you please send this patch to me. It didn't make to my Inbox.
thanks,
-- Shuah
Signature · 5 lines
Shuah Khan Sr. Linux Kernel Developer Open Source Innovation Group Samsung Research America (Silicon Valley) [email protected] | (970) 217-8978
Quoted 17 lines · Shuah Khan
Quoted 7 lines · Kees Cook
Quoted 6 lines · Robert Sesek
Certain syscall emulation layers strictly check that the number of arguments match what the syscall handler expects. The
KILL_one_arg_oneandKILL_one_arg_sixtests passed more parameters than expected to various syscalls, causing failures in this emulation mode. Instead, test using syscalls that take the appropriate number of arguments.Quoted 8 lines
Quoted 1 line
Signed-off-by Robert Sesek <[email protected]>Signed-off-by Kees Cook <[email protected]>Looks great, thanks!
Shuah, can you take this into the selftests tree?
Quoted 7 lines
Robert,
Could you please send this patch to me. It didn't make to my Inbox.
thanks,
-- Shuah
Sure. I have re-mailed you the patch directly. It's also available here:
https://patchwork.kernel.org/patch/7537891/
Thanks,
Robert
Quoted 20 lines · Robert Sesek
Quoted 19 lines · Shuah Khan
Quoted 7 lines · Kees Cook
Quoted 6 lines · Robert Sesek
Certain syscall emulation layers strictly check that the number of arguments match what the syscall handler expects. The
KILL_one_arg_oneandKILL_one_arg_sixtests passed more parameters than expected to various syscalls, causing failures in this emulation mode. Instead, test using syscalls that take the appropriate number of arguments.Quoted 8 lines
Quoted 1 line
Signed-off-by Robert Sesek <[email protected]>Signed-off-by Kees Cook <[email protected]>Looks great, thanks!
Shuah, can you take this into the selftests tree?
Robert,
Quoted 9 lines
Quoted 5 lines
Could you please send this patch to me. It didn't make to my Inbox.
thanks,
-- ShuahSure. I have re-mailed you the patch directly. It's also available here:
https://patchwork.kernel.org/patch/7537891/
Applied to linux-kselftest next for 4.4 with Kees's signedoff
Thanks
-- Shuah
Signature · 5 lines
Shuah Khan Sr. Linux Kernel Developer Open Source Innovation Group Samsung Research America (Silicon Valley) [email protected] | (970) 217-8978