selftests/seccomp: Refactor change_syscall()
Subsystems (4)
v2 cover selftests/seccomp: Refactor change_syscall()
v1: https://lore.kernel.org/lkml/[email protected]
v2:
- Took Acked patches into -next
- refactored powerpc syscall setting implementation
- refactored clone3 args implementation
Hi,
This finishes the refactoring of the seccomp selftest logic used in for ptrace syscall number/return handling for powerpc. Additionally fixes clone3 (which seccomp depends on for testing) to run under MIPS where an old struct clone_args has become visible.
(FWIW, I expect to take these via the seccomp tree.)
Thanks,
Kees Cook (4):
selftests/seccomp: Record syscall during ptrace entry selftests/seccomp: Allow syscall nr and ret value to be set separately selftests/seccomp: powerpc: Set syscall return during ptrace syscall
exit
selftests/clone3: Avoid OS-defined clone_args
tools/testing/selftests/clone3/clone3.c | 45 +++---- .../clone3/clone3_cap_checkpoint_restore.c | 4 +- .../selftests/clone3/clone3_clear_sighand.c | 2 +- .../selftests/clone3/clone3_selftests.h | 24 ++-- .../testing/selftests/clone3/clone3_set_tid.c | 4 +- tools/testing/selftests/seccomp/seccomp_bpf.c | 120 ++++++++++++++---- 6 files changed, 131 insertions(+), 68 deletions(-)
Signature · 1 line
2.25.1
PATCH v2 1/4 selftests/seccomp: Record syscall during ptrace entry
In preparation for performing actions during ptrace syscall exit, save the syscall number during ptrace syscall entry. Some architectures do no have the syscall number available during ptrace syscall exit.
--- tools/testing/selftests/seccomp/seccomp_bpf.c | 40 +++++++++++++------ 1 file changed, 27 insertions(+), 13 deletions(-)
tools/testing/selftests/seccomp/seccomp_bpf.c +27 -13
@@ -1949,12 +1949,19 @@ void tracer_seccomp(struct __test_metadata *_metadata, pid_t tracee, } +FIXTURE (TRACE_syscall) { +struct sock_fprog prog; +pid_t tracer, mytid, mypid, parent; +long syscall_nr; +}; +void tracer_ptrace (struct __test_metadata *_metadata,pid_t tracee,int status,void *args) { -int ret, nr; +int ret;unsigned long msg;static bool entry; +FIXTURE_DATA (TRACE_syscall) *self = args;/* * The traditional way to tell PTRACE_SYSCALL entry/exit
@@ -1968,24 +1975,31 @@ void tracer_ptrace(struct __test_metadata *_metadata, pid_t tracee,EXPECT_EQ (entry ?PTRACE_EVENTMSG_SYSCALL_ENTRY :PTRACE_EVENTMSG_SYSCALL_EXIT , msg); -if (!entry) +/* +* Some architectures only support setting return values during +* syscall exit under ptrace, and on exit the syscall number may +* no longer be available. Therefore, save the initial sycall +* number here, so it can be examined during both entry and exit +* phases. +*/ +if (entry) + self->syscall_nr =get_syscall (_metadata, tracee); +else return ; - nr =get_syscall (_metadata, tracee); - -if (nr == __NR_getpid) +switch (self->syscall_nr) { +case __NR_getpid:change_syscall (_metadata, tracee, __NR_getppid,0 ); -if (nr == __NR_gettid) +break ; +case __NR_gettid:change_syscall (_metadata, tracee,-1 ,45000 ); -if (nr == __NR_openat) +break ; +case __NR_openat:change_syscall (_metadata, tracee,-1 , -ESRCH ); +break ; + } } -FIXTURE (TRACE_syscall) { -struct sock_fprog prog; -pid_t tracer, mytid, mypid, parent; -}; -FIXTURE_VARIANT (TRACE_syscall) {/* * All of the SECCOMP_RET_TRACE behaviors can be tested with either
@@ -2044,7 +2058,7 @@ FIXTURE_SETUP(TRACE_syscall) self->tracer =setup_trace_fixture (_metadata, variant->use_ptrace ? tracer_ptrace : tracer_seccomp, -NULL , variant->use_ptrace); + self, variant->use_ptrace); ret =prctl (PR_SET_NO_NEW_PRIVS ,1 ,0 ,0 ,0 );ASSERT_EQ (0 , ret);
Signature · 1 line
2.25.1
Re: [PATCH v2 1/4] selftests/seccomp: Record syscall during ptrace entry
Quoted 37 lines · Kees Cook
In preparation for performing actions during ptrace syscall exit, save the syscall number during ptrace syscall entry. Some architectures do no have the syscall number available during ptrace syscall exit.
Suggested-by Thadeu Lima de Souza Cascardo <[email protected]>Signed-off-by Kees Cook <[email protected]>--- tools/testing/selftests/seccomp/seccomp_bpf.c | 40 +++++++++++++------ 1 file changed, 27 insertions(+), 13 deletions(-)tools/testing/selftests/seccomp/seccomp_bpf.c +8
-1@@ -1949,12 +1949,19 @@ void tracer_seccomp(struct __test_metadata *_metadata, pid_t tracee, } +FIXTURE (TRACE_syscall) { +struct sock_fprog prog; +pid_t tracer, mytid, mypid, parent; +long syscall_nr; +}; +void tracer_ptrace (struct __test_metadata *_metadata,pid_t tracee,int status,void *args) { -int ret, nr; +int ret;unsigned long msg;static bool entry; +FIXTURE_DATA (TRACE_syscall) *self = args;/* * The traditional way to tell PTRACE_SYSCALL entry/exit
tools/testing/selftests/seccomp/seccomp_bpf.c void tracer_ptrace(struct __test_metadata *_metadata, pid_t tracee, · line 1981
Quoted 8 lines
tools/testing/selftests/seccomp/seccomp_bpf.c +4
-1@@ -1968,24 +1975,31 @@ void tracer_ptrace(struct __test_metadata *_metadata, pid_t tracee,EXPECT_EQ (entry ?PTRACE_EVENTMSG_SYSCALL_ENTRY :PTRACE_EVENTMSG_SYSCALL_EXIT , msg); -if (!entry) +/* +* Some architectures only support setting return values during +* syscall exit under ptrace, and on exit the syscall number may +* no longer be available. Therefore, save the initial sycall
s/sycall/syscall/
Otherwise looks good. Thanks!
Quoted 46 lines
tools/testing/selftests/seccomp/seccomp_bpf.c +15
-11+* number here, so it can be examined during both entry and exit +* phases. +*/ +if (entry) + self->syscall_nr =get_syscall (_metadata, tracee); +else return ; - nr =get_syscall (_metadata, tracee); - -if (nr == __NR_getpid) +switch (self->syscall_nr) { +case __NR_getpid:change_syscall (_metadata, tracee, __NR_getppid,0 ); -if (nr == __NR_gettid) +break ; +case __NR_gettid:change_syscall (_metadata, tracee,-1 ,45000 ); -if (nr == __NR_openat) +break ; +case __NR_openat:change_syscall (_metadata, tracee,-1 , -ESRCH ); +break ; + } } -FIXTURE (TRACE_syscall) { -struct sock_fprog prog; -pid_t tracer, mytid, mypid, parent; -}; -FIXTURE_VARIANT (TRACE_syscall) {/* * All of the SECCOMP_RET_TRACE behaviors can be tested with either @@ -2044,7 +2058,7 @@ FIXTURE_SETUP(TRACE_syscall) self->tracer =setup_trace_fixture (_metadata, variant->use_ptrace ? tracer_ptrace : tracer_seccomp, -NULL , variant->use_ptrace); + self, variant->use_ptrace); ret =prctl (PR_SET_NO_NEW_PRIVS ,1 ,0 ,0 ,0 );ASSERT_EQ (0 , ret);Signature · 1 line
2.25.1
PATCH v2 2/4 selftests/seccomp: Allow syscall nr and ret value to be set separately
In reply to Kees CookIn preparation for setting syscall nr and ret values separately, refactor the helpers to take a pointer to a value, so that a NULL can indicate "do not change this respective value". This is done to keep the regset read/write happening once and in one code path.
--- tools/testing/selftests/seccomp/seccomp_bpf.c | 59 +++++++++++++++---- 1 file changed, 47 insertions(+), 12 deletions(-)
tools/testing/selftests/seccomp/seccomp_bpf.c +47 -12
@@ -1888,27 +1888,47 @@ int get_syscall(struct __test_metadata *_metadata, pid_t tracee) }/* Architecture-specific syscall changing routine. */ -void change_syscall (struct __test_metadata *_metadata, -pid_t tracee,int syscall,int result) +void __change_syscall (struct __test_metadata *_metadata, +pid_t tracee,long *syscall,long *ret) {ARCH_REGS orig, regs; +/* Do not get/set registers if we have nothing to do. */ +if (!syscall && !ret) +return ; + EXPECT_EQ(0, ARCH_GETREGS(regs)) {return ; } orig = regs; -SYSCALL_NUM_SET (regs, syscall); +if (syscall) +SYSCALL_NUM_SET (regs, *syscall); -/* If syscall is skipped, change return value. */ -if (syscall ==-1 ) -SYSCALL_RET_SET (regs, result); +if (ret) +SYSCALL_RET_SET (regs, *ret);/* Flush any register changes made. */ if (memcmp (&orig, ®s,sizeof (orig)) !=0 )EXPECT_EQ (0 ,ARCH_SETREGS (regs)); } +/* Change only syscall number. */ +void change_syscall_nr (struct __test_metadata *_metadata, +pid_t tracee,long syscall) +{ +__change_syscall (_metadata, tracee, &syscall,NULL ); +} + +/* Change syscall return value (and set syscall number to -1). */ +void change_syscall_ret (struct __test_metadata *_metadata, +pid_t tracee,long ret) +{ +long syscall =-1 ; + +__change_syscall (_metadata, tracee, &syscall, &ret); +} +void tracer_seccomp (struct __test_metadata *_metadata,pid_t tracee,int status,void *args) {
@@ -1924,17 +1944,17 @@ void tracer_seccomp(struct __test_metadata *_metadata, pid_t tracee,case 0x1002 :/* change getpid to getppid. */ EXPECT_EQ (__NR_getpid,get_syscall (_metadata, tracee)); -change_syscall (_metadata, tracee, __NR_getppid,0 ); +change_syscall_nr (_metadata, tracee, __NR_getppid);break ;case 0x1003 :/* skip gettid with valid return code. */ EXPECT_EQ (__NR_gettid,get_syscall (_metadata, tracee)); -change_syscall (_metadata, tracee,-1 ,45000 ); +change_syscall_ret (_metadata, tracee,45000 );break ;case 0x1004 :/* skip openat with error. */ EXPECT_EQ (__NR_openat,get_syscall (_metadata, tracee)); -change_syscall (_metadata, tracee,-1 , -ESRCH ); +change_syscall_ret (_metadata, tracee, -ESRCH );break ;case 0x1005 :/* do nothing (allow getppid) */
@@ -1961,6 +1981,8 @@ void tracer_ptrace(struct __test_metadata *_metadata, pid_t tracee,int ret;unsigned long msg;static bool entry; +long syscall_nr_val, syscall_ret_val; +long *syscall_nr =NULL , *syscall_ret =NULL ;FIXTURE_DATA (TRACE_syscall) *self = args;/*
@@ -1987,17 +2009,30 @@ void tracer_ptrace(struct __test_metadata *_metadata, pid_t tracee,else return ; + syscall_nr = &syscall_nr_val; + syscall_ret = &syscall_ret_val; + +/* Now handle the actual rewriting cases. */ switch (self->syscall_nr) {case __NR_getpid: -change_syscall (_metadata, tracee, __NR_getppid,0 ); + syscall_nr_val = __NR_getppid; +/* Never change syscall return for this case. */ + syscall_ret =NULL ;break ;case __NR_gettid: -change_syscall (_metadata, tracee,-1 ,45000 ); + syscall_nr_val =-1 ; + syscall_ret_val =45000 ;break ;case __NR_openat: -change_syscall (_metadata, tracee,-1 , -ESRCH ); + syscall_nr_val =-1 ; + syscall_ret_val = -ESRCH ;break ; +default : +/* Unhandled, do nothing. */ +return ; } + +__change_syscall (_metadata, tracee, syscall_nr, syscall_ret); }FIXTURE_VARIANT (TRACE_syscall) {
Signature · 1 line
2.25.1
Re: [PATCH v2 2/4] selftests/seccomp: Allow syscall nr and ret value to be set separately
Quoted 7 lines · Kees Cook
In preparation for setting syscall nr and ret values separately, refactor the helpers to take a pointer to a value, so that a NULL can indicate "do not change this respective value". This is done to keep the regset read/write happening once and in one code path.
Signed-off-by Kees Cook <[email protected]>---
Looks good!
PATCH v2 3/4 selftests/seccomp: powerpc: Set syscall return during ptrace syscall exit
In reply to Kees CookSome archs (like powerpc) only support changing the return code during syscall exit when ptrace is used. Test entry vs exit phases for which portions of the syscall number and return values need to be set at which different phases. For non-powerpc, all changes are made during ptrace syscall entry, as before. For powerpc, the syscall number is changed at ptrace syscall entry and the syscall return value is changed on ptrace syscall exit.
--- tools/testing/selftests/seccomp/seccomp_bpf.c | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-)
tools/testing/selftests/seccomp/seccomp_bpf.c +21 -4
@@ -1765,6 +1765,7 @@ TEST_F(TRACE_poke, getpid_runs_normally) (_regs).ccr &= ~0x10000000; \ } \ } while (0) +# define SYSCALL_RET_SET_ON_PTRACE_EXIT #elif defined(__s390__)# define ARCH_REGS s390_regs# define SYSCALL_NUM (_regs) (_regs).gprs[2]
@@ -1853,6 +1854,18 @@ TEST_F(TRACE_poke, getpid_runs_normally) } while (0)#endif +/* +* Some architectures (e.g. powerpc) can only set syscall +* return values on syscall exit during ptrace. +*/ +const bool ptrace_entry_set_syscall_nr = true; +const bool ptrace_entry_set_syscall_ret = +#ifndef SYSCALL_RET_SET_ON_PTRACE_EXIT + true; +#else + false; +#endif +/* * Use PTRACE_GETREGS and PTRACE_SETREGS when available. This is useful for * architectures without HAVE_ARCH_TRACEHOOK (e.g. User-mode Linux).
@@ -2006,11 +2019,15 @@ void tracer_ptrace(struct __test_metadata *_metadata, pid_t tracee,*/ if (entry) self->syscall_nr =get_syscall (_metadata, tracee); -else -return ; - syscall_nr = &syscall_nr_val; - syscall_ret = &syscall_ret_val; +/* +* Depending on the architecture's syscall setting abilities, we +* pick which things to set during this phase (entry or exit). +*/ +if (entry == ptrace_entry_set_syscall_nr) + syscall_nr = &syscall_nr_val; +if (entry == ptrace_entry_set_syscall_ret) + syscall_ret = &syscall_ret_val;/* Now handle the actual rewriting cases. */ switch (self->syscall_nr) {
Signature · 1 line
2.25.1
Re: [PATCH v2 3/4] selftests/seccomp: powerpc: Set syscall return during ptrace syscall exit
Quoted 8 lines · Kees Cook
Some archs (like powerpc) only support changing the return code during syscall exit when ptrace is used. Test entry vs exit phases for which portions of the syscall number and return values need to be set at which different phases. For non-powerpc, all changes are made during ptrace syscall entry, as before. For powerpc, the syscall number is changed at ptrace syscall entry and the syscall return value is changed on ptrace syscall exit.
Quoted 6 lines
Suggested-by Thadeu Lima de Souza Cascardo <[email protected]>Fixes 58d0a862f573 ("seccomp: add tests for ptrace hole")Signed-off-by Kees Cook <[email protected]>---
Looks good!
PATCH v2 4/4 selftests/clone3: Avoid OS-defined clone_args
In reply to Kees CookAs the UAPI headers start to appear in distros, we need to avoid outdated versions of struct clone_args to be able to test modern features; rename to "struct __clone_args". Additionally update the struct size macro names to match UAPI names.
--- tools/testing/selftests/clone3/clone3.c | 45 ++++++++----------- .../clone3/clone3_cap_checkpoint_restore.c | 4 +- .../selftests/clone3/clone3_clear_sighand.c | 2 +- .../selftests/clone3/clone3_selftests.h | 24 +++++----- .../testing/selftests/clone3/clone3_set_tid.c | 4 +- tools/testing/selftests/seccomp/seccomp_bpf.c | 4 +- 6 files changed, 40 insertions(+), 43 deletions(-)
tools/testing/selftests/clone3/clone3.c +19 -26
@@ -20,13 +20,6 @@#include "../kselftest.h" #include "clone3_selftests.h" -/* -* Different sizes of struct clone_args -*/ -#ifndef CLONE3_ARGS_SIZE_V0 -#define CLONE3_ARGS_SIZE_V0 64 -#endif -enum test_mode {CLONE3_ARGS_NO_TEST ,CLONE3_ARGS_ALL_0 ,
@@ -38,13 +31,13 @@ enum test_mode {static int call_clone3 (uint64_t flags,size_t size,enum test_mode test_mode) { -struct clone_args args = { +struct __clone_args args = { .flags = flags, .exit_signal =SIGCHLD , };struct clone_args_extended { -struct clone_args args; +struct __clone_args args;__aligned_u64 excess_space[2 ]; } args_ext;
@@ -52,11 +45,11 @@ static int call_clone3(uint64_t flags, size_t size, enum test_mode test_mode)int status;memset (&args_ext,0 ,sizeof (args_ext)); -if (size >sizeof (struct clone_args )) +if (size >sizeof (struct __clone_args )) args_ext.excess_space[1 ] =1 ;if (size ==0 ) - size =sizeof (struct clone_args ); + size =sizeof (struct __clone_args );switch (test_mode) {case CLONE3_ARGS_ALL_0 :
@@ -77,9 +70,9 @@ static int call_clone3(uint64_t flags, size_t size, enum test_mode test_mode)break ; } -memcpy (&args_ext.args, &args,sizeof (struct clone_args )); +memcpy (&args_ext.args, &args,sizeof (struct __clone_args )); - pid =sys_clone3 ((struct clone_args *)&args_ext, size); + pid =sys_clone3 ((struct __clone_args *)&args_ext, size);if (pid <0 ) {ksft_print_msg ("%s - Failed to create new process\n" ,strerror (errno));
@@ -144,14 +137,14 @@ int main(int argc, char *argv[])else ksft_test_result_skip ("Skipping clone3() with CLONE_NEWPID\n" ); -/* Do a clone3() with CLONE3_ARGS_SIZE_V0. */ -test_clone3 (0 ,CLONE3_ARGS_SIZE_V0 ,0 ,CLONE3_ARGS_NO_TEST ); +/* Do a clone3() with CLONE_ARGS_SIZE_VER0. */ +test_clone3 (0 ,CLONE_ARGS_SIZE_VER0 ,0 ,CLONE3_ARGS_NO_TEST ); -/* Do a clone3() with CLONE3_ARGS_SIZE_V0 - 8 */ -test_clone3 (0 ,CLONE3_ARGS_SIZE_V0 -8 , -EINVAL ,CLONE3_ARGS_NO_TEST ); +/* Do a clone3() with CLONE_ARGS_SIZE_VER0 - 8 */ +test_clone3 (0 ,CLONE_ARGS_SIZE_VER0 -8 , -EINVAL ,CLONE3_ARGS_NO_TEST );/* Do a clone3() with sizeof(struct clone_args) + 8 */ -test_clone3 (0 ,sizeof (struct clone_args ) +8 ,0 ,CLONE3_ARGS_NO_TEST ); +test_clone3 (0 ,sizeof (struct __clone_args ) +8 ,0 ,CLONE3_ARGS_NO_TEST );/* Do a clone3() with exit_signal having highest 32 bits non-zero */ test_clone3 (0 ,0 , -EINVAL ,CLONE3_ARGS_INVAL_EXIT_SIGNAL_BIG );
@@ -165,31 +158,31 @@ int main(int argc, char *argv[])/* Do a clone3() with NSIG < exit_signal < CSIG */ test_clone3 (0 ,0 , -EINVAL ,CLONE3_ARGS_INVAL_EXIT_SIGNAL_NSIG ); -test_clone3 (0 ,sizeof (struct clone_args ) +8 ,0 ,CLONE3_ARGS_ALL_0 ); +test_clone3 (0 ,sizeof (struct __clone_args ) +8 ,0 ,CLONE3_ARGS_ALL_0 ); -test_clone3 (0 ,sizeof (struct clone_args ) +16 , -E2BIG , +test_clone3 (0 ,sizeof (struct __clone_args ) +16 , -E2BIG ,CLONE3_ARGS_ALL_0 ); -test_clone3 (0 ,sizeof (struct clone_args ) *2 , -E2BIG , +test_clone3 (0 ,sizeof (struct __clone_args ) *2 , -E2BIG ,CLONE3_ARGS_ALL_0 );/* Do a clone3() with > page size */ test_clone3 (0 ,getpagesize () +8 , -E2BIG ,CLONE3_ARGS_NO_TEST ); -/* Do a clone3() with CLONE3_ARGS_SIZE_V0 in a new PID NS. */ +/* Do a clone3() with CLONE_ARGS_SIZE_VER0 in a new PID NS. */ if (uid ==0 ) -test_clone3 (CLONE_NEWPID ,CLONE3_ARGS_SIZE_V0 ,0 , +test_clone3 (CLONE_NEWPID ,CLONE_ARGS_SIZE_VER0 ,0 ,CLONE3_ARGS_NO_TEST );else ksft_test_result_skip ("Skipping clone3() with CLONE_NEWPID\n" ); -/* Do a clone3() with CLONE3_ARGS_SIZE_V0 - 8 in a new PID NS */ -test_clone3 (CLONE_NEWPID ,CLONE3_ARGS_SIZE_V0 -8 , -EINVAL , +/* Do a clone3() with CLONE_ARGS_SIZE_VER0 - 8 in a new PID NS */ +test_clone3 (CLONE_NEWPID ,CLONE_ARGS_SIZE_VER0 -8 , -EINVAL ,CLONE3_ARGS_NO_TEST );/* Do a clone3() with sizeof(struct clone_args) + 8 in a new PID NS */ if (uid ==0 ) -test_clone3 (CLONE_NEWPID ,sizeof (struct clone_args ) +8 ,0 , +test_clone3 (CLONE_NEWPID ,sizeof (struct __clone_args ) +8 ,0 ,CLONE3_ARGS_NO_TEST );else ksft_test_result_skip ("Skipping clone3() with CLONE_NEWPID\n" );
tools/testing/selftests/clone3/clone3_cap_checkpoint_restore.c +2 -2
@@ -44,13 +44,13 @@ static int call_clone3_set_tid(struct __test_metadata *_metadata,int status;pid_t pid =-1 ; -struct clone_args args = { +struct __clone_args args = { .exit_signal =SIGCHLD , .set_tid =ptr_to_u64 (set_tid), .set_tid_size = set_tid_size, }; - pid =sys_clone3 (&args,sizeof (struct clone_args )); + pid =sys_clone3 (&args,sizeof (args));if (pid <0 ) {TH_LOG ("%s - Failed to create new process" ,strerror (errno));return -errno;
tools/testing/selftests/clone3/clone3_clear_sighand.c +1 -1
@@ -47,7 +47,7 @@ static void test_clone3_clear_sighand(void) {int ret;pid_t pid; -struct clone_args args = {}; +struct __clone_args args = {};struct sigaction act;/*
tools/testing/selftests/clone3/clone3_selftests.h +14 -10
@@ -19,13 +19,11 @@#define CLONE_INTO_CGROUP 0x200000000ULL/* Clone into a specific cgroup given the right permissions. */ #endif -#ifndef CLONE_ARGS_SIZE_VER0 -#define CLONE_ARGS_SIZE_VER0 64 -#endif -#ifndef __NR_clone3#define __NR_clone3 -1 -struct clone_args { +#endif + +struct __clone_args {__aligned_u64 flags;__aligned_u64 pidfd;__aligned_u64 child_tid;
@@ -34,15 +32,21 @@ struct clone_args {__aligned_u64 stack;__aligned_u64 stack_size;__aligned_u64 tls; -#define CLONE_ARGS_SIZE_VER1 80 +#ifndef CLONE_ARGS_SIZE_VER0 +#define CLONE_ARGS_SIZE_VER0 64/* sizeof first published struct */ +#endif __aligned_u64 set_tid;__aligned_u64 set_tid_size; -#define CLONE_ARGS_SIZE_VER2 88 +#ifndef CLONE_ARGS_SIZE_VER1 +#define CLONE_ARGS_SIZE_VER1 80/* sizeof second published struct */ +#endif __aligned_u64 cgroup; +#ifndef CLONE_ARGS_SIZE_VER2 +#define CLONE_ARGS_SIZE_VER2 88/* sizeof third published struct */ +#endif }; -#endif /* __NR_clone3 */ -static pid_t sys_clone3 (struct clone_args *args,size_t size) +static pid_t sys_clone3 (struct __clone_args *args,size_t size) {fflush (stdout);fflush (stderr);
@@ -52,7 +56,7 @@ static pid_t sys_clone3(struct clone_args *args, size_t size)static inline void test_clone3_supported (void ) {pid_t pid; -struct clone_args args = {}; +struct __clone_args args = {};if (__NR_clone3 <0 )ksft_exit_skip ("clone3() syscall is not supported\n" );
tools/testing/selftests/clone3/clone3_set_tid.c +2 -2
@@ -46,14 +46,14 @@ static int call_clone3_set_tid(pid_t *set_tid,int status;pid_t pid =-1 ; -struct clone_args args = { +struct __clone_args args = { .flags = flags, .exit_signal =SIGCHLD , .set_tid =ptr_to_u64 (set_tid), .set_tid_size = set_tid_size, }; - pid =sys_clone3 (&args,sizeof (struct clone_args )); + pid =sys_clone3 (&args,sizeof (args));if (pid <0 ) {ksft_print_msg ("%s - Failed to create new process\n" ,strerror (errno));
tools/testing/selftests/seccomp/seccomp_bpf.c +2 -2
@@ -3817,7 +3817,7 @@ TEST(user_notification_filter_empty)long ret;int status;struct pollfd pollfd; -struct clone_args args = { +struct __clone_args args = { .flags =CLONE_FILES , .exit_signal =SIGCHLD , };
@@ -3871,7 +3871,7 @@ TEST(user_notification_filter_empty_threaded)long ret;int status;struct pollfd pollfd; -struct clone_args args = { +struct __clone_args args = { .flags =CLONE_FILES , .exit_signal =SIGCHLD , };
Signature · 1 line
2.25.1
Re: [PATCH v2 4/4] selftests/clone3: Avoid OS-defined clone_args
Quoted 7 lines · Kees Cook
As the UAPI headers start to appear in distros, we need to avoid outdated versions of struct
clone_argsto be able to test modern features; rename to "struct__clone_args". Additionally update the struct size macro names to match UAPI names.Signed-off-by Kees Cook <[email protected]>---
Looks good, thanks!