ptrace: Refactor
cover ptrace: Refactor
Wei Gao (2):
ptrace05: Refactor the test using new LTP API
ptrace06: Refactor the test using new LTP API
testcases/kernel/syscalls/ptrace/ptrace05.c | 147 +++------- testcases/kernel/syscalls/ptrace/ptrace06.c | 306 +++++++++++--------- 2 files changed, 214 insertions(+), 239 deletions(-)
Signature · 5 lines
2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH 1/2 ptrace05: Refactor the test using new LTP API
--- testcases/kernel/syscalls/ptrace/ptrace05.c | 147 ++++++-------------- 1 file changed, 39 insertions(+), 108 deletions(-)
testcases/kernel/syscalls/ptrace/ptrace05.c +39 -108
@@ -1,122 +1,67 @@ +// SPDX-License-Identifier: GPL-2.0-only /* -****************************************************************************** -* -* ptrace05 - an app which ptraces itself as per arbitrarily specified signals, -* over a user specified range. -* -* Copyright (C) 2009, Ngie Cooper -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. +* Copyright (C) 2009, Ngie Cooper +* Copyright (c) 2023 Wei Gao <[email protected]> +*/ + +/*\ +* [Description] * -* You should have received a copy of the GNU General Public License along -* with this program; if not, write to the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +* ptrace05 - an app which ptraces itself as per arbitrarily specified signals * -****************************************************************************** */ -#include <sys/types.h> -#include <sys/wait.h> -#include <signal.h> -#include <errno.h> -#include <libgen.h> -#include <math.h> #include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <unistd.h> -#include <config.h> #include "ptrace.h" -#include "test.h" #include "lapi/signal.h" +#include "tst_test.h" -char *TCID ="ptrace05" ; -int TST_TOTAL =0 ; - -int usage (const char *); - -int usage (const char *argv0) -{ -fprintf (stderr,"usage: %s [start-signum] [end-signum]\n" , argv0); -return 1 ; -} - -int main (int argc,char **argv) +static void run (void ) { -int end_signum =-1 ; -int signum; -int start_signum =-1 ; +int end_signum =SIGRTMAX ; +int signum =0 ; +int start_signum =0 ;int status;pid_t child; -tst_parse_opts (argc, argv,NULL ,NULL ); - -if (start_signum ==-1 ) { - start_signum =0 ; - } -if (end_signum ==-1 ) { - end_signum =SIGRTMAX ; - } -for (signum = start_signum; signum <= end_signum; signum++) { -if (signum >= __SIGRTMIN && signum <SIGRTMIN ) -continue ; - -switch (child =fork ()) { +switch (child =SAFE_FORK ()) {case -1 : -tst_brkm (TBROK |TERRNO ,NULL ,"fork() failed" ); +tst_brk (TBROK |TERRNO ,"fork() failed" );case 0 : -if (ptrace (PTRACE_TRACEME ,0 ,NULL ,NULL ) !=-1 ) { -tst_resm (TINFO ,"[child] Sending kill(.., %d)" , - signum); -if (kill (getpid (), signum) <0 ) { -tst_resm (TINFO |TERRNO , -"[child] kill(.., %d) failed." , - signum); - } +TEST (ptrace (PTRACE_TRACEME ,0 ,NULL ,NULL )); +if (TST_RET !=-1 ) { +tst_res (TINFO ,"[child] Sending kill(.., %d)" , + signum); +SAFE_KILL (getpid (), signum); }else { - -/* -* This won't increment the TST_COUNT var. -* properly, but it'll show up as a failure -* nonetheless. -*/ -tst_resm (TFAIL |TERRNO , +tst_brk (TFAIL |TERRNO ,"Failed to ptrace(PTRACE_TRACEME, ...) " "properly" ); - } -/* Shouldn't get here if signum == 0. */ -exit ((signum ==0 ?0 :2 )); + +exit (0 );break ;default : -waitpid (child, &status,0 ); +SAFE_WAITPID (child, &status,0 );switch (signum) {case 0 :if (WIFEXITED (status) &&WEXITSTATUS (status) ==0 ) { -tst_resm (TPASS , +tst_res (TPASS ,"kill(.., 0) exited " "with 0, as expected." ); }else { -tst_resm (TFAIL , +tst_brk (TFAIL |TERRNO ,"kill(.., 0) didn't exit " "with 0." ); }
@@ -125,20 +70,20 @@ int main(int argc, char **argv)if (WIFSIGNALED (status)) {/* SIGKILL must be uncatchable. */ if (WTERMSIG (status) ==SIGKILL ) { -tst_resm (TPASS , +tst_res (TPASS ,"Killed with SIGKILL, " "as expected." ); }else { -tst_resm (TPASS , +tst_brk (TFAIL |TERRNO ,"Didn't die with " "SIGKILL (?!) " ); } }else if (WIFEXITED (status)) { -tst_resm (TFAIL , +tst_brk (TFAIL |TERRNO ,"Exited unexpectedly instead " "of dying with SIGKILL." ); }else if (WIFSTOPPED (status)) { -tst_resm (TFAIL , +tst_brk (TFAIL |TERRNO ,"Stopped instead of dying " "with SIGKILL." ); }
@@ -146,35 +91,21 @@ int main(int argc, char **argv)/* All other processes should be stopped. */ default :if (WIFSTOPPED (status)) { -tst_resm (TPASS ,"Stopped as expected" ); +tst_res (TPASS ,"Stopped as expected" ); }else { -tst_resm (TFAIL ,"Didn't stop as " +tst_brk (TFAIL |TERRNO ,"Didn't stop as " "expected." ); -if (kill (child,0 )) { -tst_resm (TINFO , -"Is still alive!?" ); - }else if (WIFEXITED (status)) { -tst_resm (TINFO , -"Exited normally" ); - }else if (WIFSIGNALED (status)) { -tst_resm (TINFO , -"Was signaled with " -"signum=%d" , -WTERMSIG (status)); - } - } -break ; - } - } -/* Make sure the child dies a quick and painless death ... */ -kill (child,9 ); +if (signum !=0 && signum !=9 ) +SAFE_PTRACE (PTRACE_CONT , child,NULL ,NULL ); } - -tst_exit (); - } + +static struct tst_test test = { + .test_all = run, + .forks_child =1 , +};
Signature · 5 lines
2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v1 1/2] ptrace05: Refactor the test using new LTP API
Hello,
Quoted 73 lines · Wei Gao via ltp
Signed-off-by Wei Gao <[email protected]>--- testcases/kernel/syscalls/ptrace/ptrace05.c | 147 ++++++-------------- 1 file changed, 39 insertions(+), 108 deletions(-)testcases/kernel/syscalls/ptrace/ptrace05.c +9
-43@@ -1,122 +1,67 @@ +// SPDX-License-Identifier: GPL-2.0-only /* -****************************************************************************** -* -* ptrace05 - an app which ptraces itself as per arbitrarily specified signals, -* over a user specified range. -* -* Copyright (C) 2009, Ngie Cooper -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. +* Copyright (C) 2009, Ngie Cooper +* Copyright (c) 2023 Wei Gao <[email protected]> +*/ + +/*\ +* [Description] * -* You should have received a copy of the GNU General Public License along -* with this program; if not, write to the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +* ptrace05 - an app which ptraces itself as per arbitrarily specified signals * -****************************************************************************** */ -#include <sys/types.h> -#include <sys/wait.h> -#include <signal.h> -#include <errno.h> -#include <libgen.h> -#include <math.h> #include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <unistd.h> -#include <config.h> #include "ptrace.h" -#include "test.h" #include "lapi/signal.h" +#include "tst_test.h" -char *TCID ="ptrace05" ; -int TST_TOTAL =0 ; - -int usage (const char *); - -int usage (const char *argv0) -{ -fprintf (stderr,"usage: %s [start-signum] [end-signum]\n" , argv0); -return 1 ; -} - -int main (int argc,char **argv)
testcases/kernel/syscalls/ptrace/ptrace05.c line 27
Quoted 10 lines
testcases/kernel/syscalls/ptrace/ptrace05.c +4
-3+static void run (void ) { -int end_signum =-1 ; -int signum; -int start_signum =-1 ; +int end_signum =SIGRTMAX ; +int signum =0 ; +int start_signum =0 ;int status;
{start,end}_signum don't appear to serve a purpose anymore.
Quoted 6 lines
testcases/kernel/syscalls/ptrace/ptrace05.c +0
-3pid_t child; -tst_parse_opts (argc, argv,NULL ,NULL ); - -if (start_signum ==-1 ) {
testcases/kernel/syscalls/ptrace/ptrace05.c line 76
Quoted 10 lines
testcases/kernel/syscalls/ptrace/ptrace05.c +0
-8- start_signum =0 ; - } -if (end_signum ==-1 ) { - end_signum =SIGRTMAX ; - } -for (signum = start_signum; signum <= end_signum; signum++) { -if (signum >= __SIGRTMIN && signum <SIGRTMIN ) -continue ;
Why can this be removed?
I remember we had an issue on some systems because some signals are reserved by libc.
Quoted 109 lines
testcases/kernel/syscalls/ptrace/ptrace05.c +19
-44- -switch (child =fork ()) { +switch (child =SAFE_FORK ()) {case -1 : -tst_brkm (TBROK |TERRNO ,NULL ,"fork() failed" ); +tst_brk (TBROK |TERRNO ,"fork() failed" );case 0 : -if (ptrace (PTRACE_TRACEME ,0 ,NULL ,NULL ) !=-1 ) { -tst_resm (TINFO ,"[child] Sending kill(.., %d)" , - signum); -if (kill (getpid (), signum) <0 ) { -tst_resm (TINFO |TERRNO , -"[child] kill(.., %d) failed." , - signum); - } +TEST (ptrace (PTRACE_TRACEME ,0 ,NULL ,NULL )); +if (TST_RET !=-1 ) { +tst_res (TINFO ,"[child] Sending kill(.., %d)" , + signum); +SAFE_KILL (getpid (), signum); }else { - -/* -* This won't increment the TST_COUNT var. -* properly, but it'll show up as a failure -* nonetheless. -*/ -tst_resm (TFAIL |TERRNO , +tst_brk (TFAIL |TERRNO ,"Failed to ptrace(PTRACE_TRACEME, ...) " "properly" ); - } -/* Shouldn't get here if signum == 0. */ -exit ((signum ==0 ?0 :2 )); + +exit (0 );break ;default : -waitpid (child, &status,0 ); +SAFE_WAITPID (child, &status,0 );switch (signum) {case 0 :if (WIFEXITED (status) &&WEXITSTATUS (status) ==0 ) { -tst_resm (TPASS , +tst_res (TPASS ,"kill(.., 0) exited " "with 0, as expected." ); }else { -tst_resm (TFAIL , +tst_brk (TFAIL |TERRNO ,"kill(.., 0) didn't exit " "with 0." ); }@@ -125,20 +70,20 @@ int main(int argc, char **argv)if (WIFSIGNALED (status)) {/* SIGKILL must be uncatchable. */ if (WTERMSIG (status) ==SIGKILL ) { -tst_resm (TPASS , +tst_res (TPASS ,"Killed with SIGKILL, " "as expected." ); }else { -tst_resm (TPASS , +tst_brk (TFAIL |TERRNO ,"Didn't die with " "SIGKILL (?!) " ); } }else if (WIFEXITED (status)) { -tst_resm (TFAIL , +tst_brk (TFAIL |TERRNO ,"Exited unexpectedly instead " "of dying with SIGKILL." ); }else if (WIFSTOPPED (status)) { -tst_resm (TFAIL , +tst_brk (TFAIL |TERRNO ,"Stopped instead of dying " "with SIGKILL." ); }@@ -146,35 +91,21 @@ int main(int argc, char **argv)/* All other processes should be stopped. */ default :if (WIFSTOPPED (status)) { -tst_resm (TPASS ,"Stopped as expected" ); +tst_res (TPASS ,"Stopped as expected" ); }else { -tst_resm (TFAIL ,"Didn't stop as " +tst_brk (TFAIL |TERRNO ,"Didn't stop as " "expected." ); -if (kill (child,0 )) { -tst_resm (TINFO , -"Is still alive!?" ); - }else if (WIFEXITED (status)) { -tst_resm (TINFO , -"Exited normally" ); - }else if (WIFSIGNALED (status)) { -tst_resm (TINFO , -"Was signaled with " -"signum=%d" , -WTERMSIG (status)); - } - } -
testcases/kernel/syscalls/ptrace/ptrace05.c int main(int argc, char **argv) · line 104
Quoted 10 lines
testcases/kernel/syscalls/ptrace/ptrace05.c +2
-4break ; - } - } -/* Make sure the child dies a quick and painless death ... */ -kill (child,9 ); +if (signum !=0 && signum !=9 ) +SAFE_PTRACE (PTRACE_CONT , child,NULL ,NULL );
nit; it's clearer to write SIGKILL than 9 also some other signals change number between platforms.
Quoted 12 lines
testcases/kernel/syscalls/ptrace/ptrace05.c +5
-3} - -tst_exit (); - } + +static struct tst_test test = { + .test_all = run, + .forks_child =1 , +};Signature · 1 line
2.35.3
Signature · 5 lines
Thank you, Richard. -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v1 1/2] ptrace05: Refactor the test using new LTP API
In reply to Wei Gao via ltpHi Wei,
make check-ptrace05 shows various redefinitions, that points on ptrace.h cleanup needed, I'll fix it as a separate change.
CHECK testcases/kernel/syscalls/ptrace/ptrace05.cptrace05.c: note: in included file (through ptrace.h):/usr/include/linux/ptrace.h:50:9: warning: preprocessor token PTRACE_GETREGSET redefined ptrace05.c: note: in included file (through ptrace.h):/usr/include/sys/ptrace.h:153:9: this was the original definition ptrace05.c: note: in included file (through ptrace.h):/usr/include/linux/ptrace.h:51:9: warning: preprocessor token PTRACE_SETREGSET redefined ptrace05.c: note: in included file (through ptrace.h):/usr/include/sys/ptrace.h:157:9: this was the original definition ptrace05.c: note: in included file (through ptrace.h):/usr/include/linux/ptrace.h:53:9: warning: preprocessor token PTRACE_SEIZE redefined
I handled this in separate patchset [3], I Cc you. Could you please base v2 on it? I hope it will be merged soon.
[1] https://sourceware.org/glibc/wiki/Synchronizing_Headers
[2] https://github.com/linux-test-project/ltp/wiki/Supported-kernel,-libc,-toolchain-versions#11-oldest-tested-distributions
[3] https://patchwork.ozlabs.org/project/ltp/list/?series=384172&state=*
testcases/kernel/syscalls/ptrace/ptrace05.c line 1
Quoted 11 lines
Signed-off-by Wei Gao <[email protected]>--- testcases/kernel/syscalls/ptrace/ptrace05.c | 147 ++++++-------------- 1 file changed, 39 insertions(+), 108 deletions(-)testcases/kernel/syscalls/ptrace/ptrace05.c +1
-0@@ -1,122 +1,67 @@ +// SPDX-License-Identifier: GPL-2.0-only
// SPDX-License-Identifier: GPL-2.0-or-later
testcases/kernel/syscalls/ptrace/ptrace05.c line 12
Quoted 12 lines
testcases/kernel/syscalls/ptrace/ptrace05.c +0
-11/* -****************************************************************************** -* -* ptrace05 - an app which ptraces itself as per arbitrarily specified signals, -* over a user specified range. -* -* Copyright (C) 2009, Ngie Cooper -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version.
"any later version" is why GPL-2.0-or-later instead of GPL-2.0-only.
testcases/kernel/syscalls/ptrace/ptrace05.c line 4
Quoted 6 lines
testcases/kernel/syscalls/ptrace/ptrace05.c +2
-4-* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. +* Copyright (C) 2009, Ngie Cooper +* Copyright (c) 2023 Wei Gao <[email protected]>
Please add also LTP copyright (more people contributed to this test):
* Copyright (c) Linux Test Project, 2009-2019
testcases/kernel/syscalls/ptrace/ptrace05.c line 10
Quoted 9 lines
testcases/kernel/syscalls/ptrace/ptrace05.c +5
-3+*/ + +/*\ +* [Description] * -* You should have received a copy of the GNU General Public License along -* with this program; if not, write to the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +* ptrace05 - an app which ptraces itself as per arbitrarily specified signals
I'm not really sure for a proper description, but we don't list the test name, also s/app/test/
Quoted 56 lines
testcases/kernel/syscalls/ptrace/ptrace05.c +5
-36* -****************************************************************************** */ -#include <sys/types.h> -#include <sys/wait.h> -#include <signal.h> -#include <errno.h> -#include <libgen.h> -#include <math.h> #include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <unistd.h> -#include <config.h> #include "ptrace.h" -#include "test.h" #include "lapi/signal.h" +#include "tst_test.h" -char *TCID ="ptrace05" ; -int TST_TOTAL =0 ; - -int usage (const char *); - -int usage (const char *argv0) -{ -fprintf (stderr,"usage: %s [start-signum] [end-signum]\n" , argv0); -return 1 ; -} - -int main (int argc,char **argv) +static void run (void ) { -int end_signum =-1 ; -int signum; -int start_signum =-1 ; +int end_signum =SIGRTMAX ; +int signum =0 ; +int start_signum =0 ;int status;pid_t child; -tst_parse_opts (argc, argv,NULL ,NULL ); - -if (start_signum ==-1 ) { - start_signum =0 ; - } -if (end_signum ==-1 ) { - end_signum =SIGRTMAX ; - } -
testcases/kernel/syscalls/ptrace/ptrace05.c line 35
Quoted 10 lines
testcases/kernel/syscalls/ptrace/ptrace05.c +2
-5for (signum = start_signum; signum <= end_signum; signum++) { -if (signum >= __SIGRTMIN && signum <SIGRTMIN ) -continue ; - -switch (child =fork ()) { +switch (child =SAFE_FORK ()) {case -1 : -tst_brkm (TBROK |TERRNO ,NULL ,"fork() failed" ); +tst_brk (TBROK |TERRNO ,"fork() failed" );
We have this handled in SAFE_FORK(), it should be removed here. Therefore switch+case should be replaced with if+else.
Quoted 8 lines
testcases/kernel/syscalls/ptrace/ptrace05.c +1
-2case 0 : -tst_resm (TFAIL |TERRNO , +tst_brk (TFAIL |TERRNO ,"Failed to ptrace(PTRACE_TRACEME, ...) " "properly" ); - }
...
testcases/kernel/syscalls/ptrace/ptrace05.c line 49
Quoted 4 lines
testcases/kernel/syscalls/ptrace/ptrace05.c +2
-2-/* Shouldn't get here if signum == 0. */ -exit ((signum ==0 ?0 :2 )); + +exit (0 );
Why there can be always exit(0) ?
Quoted 5 lines
testcases/kernel/syscalls/ptrace/ptrace05.c +0
-1break ;default : -waitpid (child, &status,0 );
testcases/kernel/syscalls/ptrace/ptrace05.c line 62
Quoted 10 lines
testcases/kernel/syscalls/ptrace/ptrace05.c +2
-1+SAFE_WAITPID (child, &status,0 );switch (signum) {case 0 :if (WIFEXITED (status) &&WEXITSTATUS (status) ==0 ) { -tst_resm (TPASS , +tst_res (TPASS ,"kill(.., 0) exited " "with 0, as expected." );
Please join strings (this applies to code below as well).
testcases/kernel/syscalls/ptrace/ptrace05.c line 66
Quoted 5 lines
testcases/kernel/syscalls/ptrace/ptrace05.c +1
-1}else { -tst_resm (TFAIL , +tst_brk (TFAIL |TERRNO ,"kill(.., 0) didn't exit " "with 0." );
Why not tst_res(TFAIL, ...) ? (this applies to code below as well)
...
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH 2/2 ptrace06: Refactor the test using new LTP API
In reply to Wei Gao via ltp--- testcases/kernel/syscalls/ptrace/ptrace06.c | 306 +++++++++++--------- 1 file changed, 175 insertions(+), 131 deletions(-)
testcases/kernel/syscalls/ptrace/ptrace06.c +175 -131
@@ -1,32 +1,31 @@ +// SPDX-License-Identifier: GPL-2.0-only /* +* Copyright (c) 2008 Analog Devices Inc. +* Copyright (c) 2023 Wei Gao <[email protected]> +*/ + +/*\ +* [Description] +* * check out-of-bound/unaligned addresses given to * - {PEEK,POKE}{DATA,TEXT,USER} * - {GET,SET}{,FG}REGS * - {GET,SET}SIGINFO * -* Copyright (c) 2008 Analog Devices Inc. -* -* Licensed under the GPL-2 or later */ #define _GNU_SOURCE -#include <errno.h> -#include <stdbool.h> -#include <stdio.h> #include <stdlib.h> -#include <unistd.h> -#include <config.h> -#include "ptrace.h" -#include "test.h" -#include "spawn_ptrace_child.h" -#include "config.h" +#include "ptrace.h" +#include "tst_test.h" /* this should be sizeof(struct user), but that info is only found * in the kernel asm/user.h which is not exported to userspace. */ +#if defined(__i386__)#define SIZEOF_USER 284#elif defined(__x86_64__)
@@ -35,168 +34,213 @@#define SIZEOF_USER 0x1000/* just pick a big number */ #endif -char *TCID ="ptrace06" ; -struct test_case_t {int request;long addr;long data; } test_cases[] = { { -PTRACE_PEEKDATA ,.addr =0 }, { -PTRACE_PEEKDATA ,.addr =1 }, { -PTRACE_PEEKDATA ,.addr =2 }, { -PTRACE_PEEKDATA ,.addr =3 }, { -PTRACE_PEEKDATA ,.addr =-1 }, { -PTRACE_PEEKDATA ,.addr =-2 }, { -PTRACE_PEEKDATA ,.addr =-3 }, { -PTRACE_PEEKDATA ,.addr =-4 }, { -PTRACE_PEEKTEXT ,.addr =0 }, { -PTRACE_PEEKTEXT ,.addr =1 }, { -PTRACE_PEEKTEXT ,.addr =2 }, { -PTRACE_PEEKTEXT ,.addr =3 }, { -PTRACE_PEEKTEXT ,.addr =-1 }, { -PTRACE_PEEKTEXT ,.addr =-2 }, { -PTRACE_PEEKTEXT ,.addr =-3 }, { -PTRACE_PEEKTEXT ,.addr =-4 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +1 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +2 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +3 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +4 }, { -PTRACE_PEEKUSER ,.addr =-1 }, { -PTRACE_PEEKUSER ,.addr =-2 }, { -PTRACE_PEEKUSER ,.addr =-3 }, { -PTRACE_PEEKUSER ,.addr =-4 }, { -PTRACE_POKEDATA ,.addr =0 }, { -PTRACE_POKEDATA ,.addr =1 }, { -PTRACE_POKEDATA ,.addr =2 }, { -PTRACE_POKEDATA ,.addr =3 }, { -PTRACE_POKEDATA ,.addr =-1 }, { -PTRACE_POKEDATA ,.addr =-2 }, { -PTRACE_POKEDATA ,.addr =-3 }, { -PTRACE_POKEDATA ,.addr =-4 }, { -PTRACE_POKETEXT ,.addr =0 }, { -PTRACE_POKETEXT ,.addr =1 }, { -PTRACE_POKETEXT ,.addr =2 }, { -PTRACE_POKETEXT ,.addr =3 }, { -PTRACE_POKETEXT ,.addr =-1 }, { -PTRACE_POKETEXT ,.addr =-2 }, { -PTRACE_POKETEXT ,.addr =-3 }, { -PTRACE_POKETEXT ,.addr =-4 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +1 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +2 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +3 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +4 }, { -PTRACE_POKEUSER ,.addr =-1 }, { -PTRACE_POKEUSER ,.addr =-2 }, { -PTRACE_POKEUSER ,.addr =-3 }, { -PTRACE_POKEUSER ,.addr =-4 }, +PTRACE_PEEKDATA , .addr =0 }, { +PTRACE_PEEKDATA , .addr =1 }, { +PTRACE_PEEKDATA , .addr =2 }, { +PTRACE_PEEKDATA , .addr =3 }, { +PTRACE_PEEKDATA , .addr =-1 }, { +PTRACE_PEEKDATA , .addr =-2 }, { +PTRACE_PEEKDATA , .addr =-3 }, { +PTRACE_PEEKDATA , .addr =-4 }, { +PTRACE_PEEKTEXT , .addr =0 }, { +PTRACE_PEEKTEXT , .addr =1 }, { +PTRACE_PEEKTEXT , .addr =2 }, { +PTRACE_PEEKTEXT , .addr =3 }, { +PTRACE_PEEKTEXT , .addr =-1 }, { +PTRACE_PEEKTEXT , .addr =-2 }, { +PTRACE_PEEKTEXT , .addr =-3 }, { +PTRACE_PEEKTEXT , .addr =-4 }, { +PTRACE_PEEKUSER , .addr =SIZEOF_USER +1 }, { +PTRACE_PEEKUSER , .addr =SIZEOF_USER +2 }, { +PTRACE_PEEKUSER , .addr =SIZEOF_USER +3 }, { +PTRACE_PEEKUSER , .addr =SIZEOF_USER +4 }, { +PTRACE_PEEKUSER , .addr =-1 }, { +PTRACE_PEEKUSER , .addr =-2 }, { +PTRACE_PEEKUSER , .addr =-3 }, { +PTRACE_PEEKUSER , .addr =-4 }, { +PTRACE_POKEDATA , .addr =0 }, { +PTRACE_POKEDATA , .addr =1 }, { +PTRACE_POKEDATA , .addr =2 }, { +PTRACE_POKEDATA , .addr =3 }, { +PTRACE_POKEDATA , .addr =-1 }, { +PTRACE_POKEDATA , .addr =-2 }, { +PTRACE_POKEDATA , .addr =-3 }, { +PTRACE_POKEDATA , .addr =-4 }, { +PTRACE_POKETEXT , .addr =0 }, { +PTRACE_POKETEXT , .addr =1 }, { +PTRACE_POKETEXT , .addr =2 }, { +PTRACE_POKETEXT , .addr =3 }, { +PTRACE_POKETEXT , .addr =-1 }, { +PTRACE_POKETEXT , .addr =-2 }, { +PTRACE_POKETEXT , .addr =-3 }, { +PTRACE_POKETEXT , .addr =-4 }, { +PTRACE_POKEUSER , .addr =SIZEOF_USER +1 }, { +PTRACE_POKEUSER , .addr =SIZEOF_USER +2 }, { +PTRACE_POKEUSER , .addr =SIZEOF_USER +3 }, { +PTRACE_POKEUSER , .addr =SIZEOF_USER +4 }, { +PTRACE_POKEUSER , .addr =-1 }, { +PTRACE_POKEUSER , .addr =-2 }, { +PTRACE_POKEUSER , .addr =-3 }, { +PTRACE_POKEUSER , .addr =-4 }, #ifdef PTRACE_GETREGS { -PTRACE_GETREGS ,.data =0 }, { -PTRACE_GETREGS ,.data =1 }, { -PTRACE_GETREGS ,.data =2 }, { -PTRACE_GETREGS ,.data =3 }, { -PTRACE_GETREGS ,.data =-1 }, { -PTRACE_GETREGS ,.data =-2 }, { -PTRACE_GETREGS ,.data =-3 }, { -PTRACE_GETREGS ,.data =-4 }, +PTRACE_GETREGS , .data =0 }, { +PTRACE_GETREGS , .data =1 }, { +PTRACE_GETREGS , .data =2 }, { +PTRACE_GETREGS , .data =3 }, { +PTRACE_GETREGS , .data =-1 }, { +PTRACE_GETREGS , .data =-2 }, { +PTRACE_GETREGS , .data =-3 }, { +PTRACE_GETREGS , .data =-4 }, #endif #ifdef PTRACE_GETFGREGS { -PTRACE_GETFGREGS ,.data =0 }, { -PTRACE_GETFGREGS ,.data =1 }, { -PTRACE_GETFGREGS ,.data =2 }, { -PTRACE_GETFGREGS ,.data =3 }, { -PTRACE_GETFGREGS ,.data =-1 }, { -PTRACE_GETFGREGS ,.data =-2 }, { -PTRACE_GETFGREGS ,.data =-3 }, { -PTRACE_GETFGREGS ,.data =-4 }, +PTRACE_GETFGREGS , .data =0 }, { +PTRACE_GETFGREGS , .data =1 }, { +PTRACE_GETFGREGS , .data =2 }, { +PTRACE_GETFGREGS , .data =3 }, { +PTRACE_GETFGREGS , .data =-1 }, { +PTRACE_GETFGREGS , .data =-2 }, { +PTRACE_GETFGREGS , .data =-3 }, { +PTRACE_GETFGREGS , .data =-4 }, #endif #ifdef PTRACE_SETREGS { -PTRACE_SETREGS ,.data =0 }, { -PTRACE_SETREGS ,.data =1 }, { -PTRACE_SETREGS ,.data =2 }, { -PTRACE_SETREGS ,.data =3 }, { -PTRACE_SETREGS ,.data =-1 }, { -PTRACE_SETREGS ,.data =-2 }, { -PTRACE_SETREGS ,.data =-3 }, { -PTRACE_SETREGS ,.data =-4 }, +PTRACE_SETREGS , .data =0 }, { +PTRACE_SETREGS , .data =1 }, { +PTRACE_SETREGS , .data =2 }, { +PTRACE_SETREGS , .data =3 }, { +PTRACE_SETREGS , .data =-1 }, { +PTRACE_SETREGS , .data =-2 }, { +PTRACE_SETREGS , .data =-3 }, { +PTRACE_SETREGS , .data =-4 }, #endif #ifdef PTRACE_SETFGREGS { -PTRACE_SETFGREGS ,.data =0 }, { -PTRACE_SETFGREGS ,.data =1 }, { -PTRACE_SETFGREGS ,.data =2 }, { -PTRACE_SETFGREGS ,.data =3 }, { -PTRACE_SETFGREGS ,.data =-1 }, { -PTRACE_SETFGREGS ,.data =-2 }, { -PTRACE_SETFGREGS ,.data =-3 }, { -PTRACE_SETFGREGS ,.data =-4 }, +PTRACE_SETFGREGS , .data =0 }, { +PTRACE_SETFGREGS , .data =1 }, { +PTRACE_SETFGREGS , .data =2 }, { +PTRACE_SETFGREGS , .data =3 }, { +PTRACE_SETFGREGS , .data =-1 }, { +PTRACE_SETFGREGS , .data =-2 }, { +PTRACE_SETFGREGS , .data =-3 }, { +PTRACE_SETFGREGS , .data =-4 }, #endif #if HAVE_DECL_PTRACE_GETSIGINFO { -PTRACE_GETSIGINFO ,.data =0 }, { -PTRACE_GETSIGINFO ,.data =1 }, { -PTRACE_GETSIGINFO ,.data =2 }, { -PTRACE_GETSIGINFO ,.data =3 }, { -PTRACE_GETSIGINFO ,.data =-1 }, { -PTRACE_GETSIGINFO ,.data =-2 }, { -PTRACE_GETSIGINFO ,.data =-3 }, { -PTRACE_GETSIGINFO ,.data =-4 }, +PTRACE_GETSIGINFO , .data =0 }, { +PTRACE_GETSIGINFO , .data =1 }, { +PTRACE_GETSIGINFO , .data =2 }, { +PTRACE_GETSIGINFO , .data =3 }, { +PTRACE_GETSIGINFO , .data =-1 }, { +PTRACE_GETSIGINFO , .data =-2 }, { +PTRACE_GETSIGINFO , .data =-3 }, { +PTRACE_GETSIGINFO , .data =-4 }, #endif #if HAVE_DECL_PTRACE_SETSIGINFO { -PTRACE_SETSIGINFO ,.data =0 }, { -PTRACE_SETSIGINFO ,.data =1 }, { -PTRACE_SETSIGINFO ,.data =2 }, { -PTRACE_SETSIGINFO ,.data =3 }, { -PTRACE_SETSIGINFO ,.data =-1 }, { -PTRACE_SETSIGINFO ,.data =-2 }, { -PTRACE_SETSIGINFO ,.data =-3 }, { -PTRACE_SETSIGINFO ,.data =-4 }, +PTRACE_SETSIGINFO , .data =0 }, { +PTRACE_SETSIGINFO , .data =1 }, { +PTRACE_SETSIGINFO , .data =2 }, { +PTRACE_SETSIGINFO , .data =3 }, { +PTRACE_SETSIGINFO , .data =-1 }, { +PTRACE_SETSIGINFO , .data =-2 }, { +PTRACE_SETSIGINFO , .data =-3 }, { +PTRACE_SETSIGINFO , .data =-4 }, +#endif +}; + +#define SPT (x) [PTRACE_##x] = #x, +static char *strings[] = { + SPT(TRACEME) + SPT(PEEKTEXT) + SPT(PEEKDATA) + SPT(PEEKUSER) + SPT(POKETEXT) + SPT(POKEDATA) + SPT(POKEUSER) +#ifdef PTRACE_GETREGS + SPT(GETREGS) +#endif +#ifdef PTRACE_SETREGS + SPT(SETREGS) +#endif +#ifdef PTRACE_GETSIGINFO + SPT(GETSIGINFO) +#endif +#ifdef PTRACE_SETSIGINFO + SPT(SETSIGINFO) +#endif +#ifdef PTRACE_GETFGREGS + SPT(GETFGREGS) +#endif +#ifdef PTRACE_SETFGREGS + SPT(SETFGREGS) #endif + SPT(KILL) +SPT (SINGLESTEP ) }; -int TST_TOTAL =ARRAY_SIZE (test_cases); +static inline char *strptrace (int request) +{ +return strings[request]; +} + +static void child (void ) +{ +SAFE_PTRACE (PTRACE_TRACEME ,0 ,NULL ,NULL ); +execl ("/bin/echo" ,"/bin/echo" ,NULL ); +exit (0 ); +} -int main (int argc,char *argv[]) +static void run (void ) {size_t i; -long ret; -int saved_errno; +int pid; +int status; -tst_parse_opts (argc, argv,NULL ,NULL ); + pid =SAFE_FORK (); -make_a_baby (argc, argv); +if (!pid) +child (); + +SAFE_WAIT (&status); + +if (!WIFSTOPPED (status)) +tst_brk (TBROK ,"child %d was not stopped" , pid);for (i =0 ; i <ARRAY_SIZE (test_cases); ++i) {struct test_case_t *tc = &test_cases[i]; - errno =0 ; - ret = -ptrace (tc->request, pid, (void *)tc->addr, - (void *)tc->data); - saved_errno = errno; -if (ret !=-1 ) -tst_resm (TFAIL , +TEST (ptrace (tc->request, pid, (void *)tc->addr, + (void *)tc->data)); +if (TST_RET !=-1 ) +tst_brk (TFAIL |TERRNO ,"ptrace(%s, ..., %li, %li) returned %li instead of -1" ,strptrace (tc->request), tc->addr, tc->data, - ret); -else if (saved_errno !=EIO && saved_errno !=EFAULT ) -tst_resm (TFAIL , +TST_RET ); +else if (TST_ERR !=EIO &&TST_ERR !=EFAULT ) +tst_brk (TFAIL |TERRNO ,"ptrace(%s, ..., %li, %li) expected errno EIO or EFAULT; actual: %i (%s)" ,strptrace (tc->request), tc->addr, tc->data, - saved_errno,strerror (saved_errno)); +TST_ERR ,strerror (TST_ERR ));else -tst_resm (TPASS , +tst_res (TPASS ,"ptrace(%s, ..., %li, %li) failed as expected" ,strptrace (tc->request), tc->addr, tc->data); } -/* hopefully this worked */ -ptrace (PTRACE_KILL , pid,NULL ,NULL ); +SAFE_PTRACE (PTRACE_CONT , pid,NULL ,NULL ); -tst_exit (); } + +static struct tst_test test = { + .test_all = run, + .forks_child =1 , +};
Signature · 5 lines
2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v1 2/2] ptrace06: Refactor the test using new LTP API
Hi Wei,
note ptrace06 was not even been compiled. I tested that even in old API it worked, thus I re-enable it in patch
https://patchwork.ozlabs.org/project/ltp/patch/[email protected]/
(part of https://patchwork.ozlabs.org/project/ltp/list/?series=384172&state=*)
testcases/kernel/syscalls/ptrace/ptrace06.c line 1
Quoted 3 lines
+++
b/testcases/kernel/syscalls/ptrace/ptrace06.ctestcases/kernel/syscalls/ptrace/ptrace06.c +1
-0@@ -1,32 +1,31 @@ +// SPDX-License-Identifier: GPL-2.0-only
Again:
// SPDX-License-Identifier: GPL-2.0-or-later
testcases/kernel/syscalls/ptrace/ptrace06.c line 10
Quoted 9 lines
testcases/kernel/syscalls/ptrace/ptrace06.c +7
-0/* +* Copyright (c) 2008 Analog Devices Inc. +* Copyright (c) 2023 Wei Gao <[email protected]> +*/ + +/*\ +* [Description] +* * check out-of-bound/unaligned addresses given to
Without missing blank line here the list will not be working.
testcases/kernel/syscalls/ptrace/ptrace06.c line 14
Quoted 4 lines
testcases/kernel/syscalls/ptrace/ptrace06.c +0
-0* - {PEEK,POKE}{DATA,TEXT,USER} * - {GET,SET}{,FG}REGS * - {GET,SET}SIGINFO *
Why this blank line above?
testcases/kernel/syscalls/ptrace/ptrace06.c line 9
Quoted 3 lines
testcases/kernel/syscalls/ptrace/ptrace06.c +0
-3-* Copyright (c) 2008 Analog Devices Inc. -* -* Licensed under the GPL-2 or later
... because this:
testcases/kernel/syscalls/ptrace/ptrace06.c line 17
Quoted 3 lines
testcases/kernel/syscalls/ptrace/ptrace06.c +0
-0*/ #define _GNU_SOURCE
This might not be needed (needs to be verified in CI if also the oldest distros does not need it).
testcases/kernel/syscalls/ptrace/ptrace06.c line 35
Quoted 10 lines
testcases/kernel/syscalls/ptrace/ptrace06.c +1
-0/* this should be sizeof(struct user), but that info is only found * in the kernel asm/user.h which is not exported to userspace. */ +#if defined(__i386__)#define SIZEOF_USER 284#elif defined(__x86_64__)@@ -35,168 +34,213 @@#define SIZEOF_USER 0x1000/* just pick a big number */ #endif
I wonder if this SIZEOF_USER is valid. I haven't found what value they mean (they talk about arch/*/include/asm/user*.h in kernel).
testcases/kernel/syscalls/ptrace/ptrace06.c line 44
Quoted 10 lines
testcases/kernel/syscalls/ptrace/ptrace06.c +2
-2-char *TCID ="ptrace06" ; -struct test_case_t {int request;long addr;long data; } test_cases[] = { { +PTRACE_PEEKDATA , .addr =0 }, { +PTRACE_PEEKDATA , .addr =1 }, {
IMHO This is ugly formatting, brackets shold be always on the same place. .e.g
{ PTRACE_PEEKDATA, .addr = 0},
{ PTRACE_PEEKDATA, .addr = 1},
Quoted 4 lines
testcases/kernel/syscalls/ptrace/ptrace06.c +4
-0+ PTRACE_PEEKDATA, .addr = 2}, { + PTRACE_PEEKDATA, .addr = 3}, { + PTRACE_PEEKDATA, .addr = -1}, { + PTRACE_PEEKDATA, .addr = -2}, {
...
testcases/kernel/syscalls/ptrace/ptrace06.c line 198
Quoted 4 lines
testcases/kernel/syscalls/ptrace/ptrace06.c +4
-0+static void child (void ) +{ +SAFE_PTRACE (PTRACE_TRACEME ,0 ,NULL ,NULL ); +execl ("/bin/echo" ,"/bin/echo" ,NULL );
This will not work for AOSP (Android). Maybe adding ptrace06_child.c with very simple code (printf or tst_res(TINFO) something, use TST_NO_DEFAULT_MAIN) would be better.
testcases/kernel/syscalls/ptrace/ptrace06.c line 200
Quoted 2 lines
testcases/kernel/syscalls/ptrace/ptrace06.c +2
-0+exit (0 ); +}
...
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v1 2/2] ptrace06: Refactor the test using new LTP API
Quoted 12 lines · Petr Vorel
Hi Wei,
testcases/kernel/syscalls/ptrace/ptrace06.c line 35
Quoted 6 lines
#if
defined(__i386__)
#defineSIZEOF_USER284
#elifdefined(__x86_64__)testcases/kernel/syscalls/ptrace/ptrace06.c +0
-0@@ -35,168 +34,213 @@#define SIZEOF_USER 0x1000/* just pick a big number */ #endif I wonder if this
SIZEOF_USERis valid. I haven't found what value they mean (they talk aboutarch/*/include/asm/user*.hin kernel).
Yes, i also not found SIZEOF_USER, but i suppose the risk is low since the kernel code for struct user is quite stable and the latest update is 2008.3.
Thanks.
Regards
Gao Wei
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v1 2/2] ptrace06: Refactor the test using new LTP API
In reply to Wei Gao via ltpHello,
Quoted 308 lines · Wei Gao via ltp
Signed-off-by Wei Gao <[email protected]>--- testcases/kernel/syscalls/ptrace/ptrace06.c | 306 +++++++++++--------- 1 file changed, 175 insertions(+), 131 deletions(-)testcases/kernel/syscalls/ptrace/ptrace06.c +138
-110@@ -1,32 +1,31 @@ +// SPDX-License-Identifier: GPL-2.0-only /* +* Copyright (c) 2008 Analog Devices Inc. +* Copyright (c) 2023 Wei Gao <[email protected]> +*/ + +/*\ +* [Description] +* * check out-of-bound/unaligned addresses given to * - {PEEK,POKE}{DATA,TEXT,USER} * - {GET,SET}{,FG}REGS * - {GET,SET}SIGINFO * -* Copyright (c) 2008 Analog Devices Inc. -* -* Licensed under the GPL-2 or later */ #define _GNU_SOURCE -#include <errno.h> -#include <stdbool.h> -#include <stdio.h> #include <stdlib.h> -#include <unistd.h> -#include <config.h> -#include "ptrace.h" -#include "test.h" -#include "spawn_ptrace_child.h" -#include "config.h" +#include "ptrace.h" +#include "tst_test.h" /* this should be sizeof(struct user), but that info is only found * in the kernel asm/user.h which is not exported to userspace. */ +#if defined(__i386__)#define SIZEOF_USER 284#elif defined(__x86_64__)@@ -35,168 +34,213 @@#define SIZEOF_USER 0x1000/* just pick a big number */ #endif -char *TCID ="ptrace06" ; -struct test_case_t {int request;long addr;long data; } test_cases[] = { { -PTRACE_PEEKDATA ,.addr =0 }, { -PTRACE_PEEKDATA ,.addr =1 }, { -PTRACE_PEEKDATA ,.addr =2 }, { -PTRACE_PEEKDATA ,.addr =3 }, { -PTRACE_PEEKDATA ,.addr =-1 }, { -PTRACE_PEEKDATA ,.addr =-2 }, { -PTRACE_PEEKDATA ,.addr =-3 }, { -PTRACE_PEEKDATA ,.addr =-4 }, { -PTRACE_PEEKTEXT ,.addr =0 }, { -PTRACE_PEEKTEXT ,.addr =1 }, { -PTRACE_PEEKTEXT ,.addr =2 }, { -PTRACE_PEEKTEXT ,.addr =3 }, { -PTRACE_PEEKTEXT ,.addr =-1 }, { -PTRACE_PEEKTEXT ,.addr =-2 }, { -PTRACE_PEEKTEXT ,.addr =-3 }, { -PTRACE_PEEKTEXT ,.addr =-4 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +1 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +2 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +3 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +4 }, { -PTRACE_PEEKUSER ,.addr =-1 }, { -PTRACE_PEEKUSER ,.addr =-2 }, { -PTRACE_PEEKUSER ,.addr =-3 }, { -PTRACE_PEEKUSER ,.addr =-4 }, { -PTRACE_POKEDATA ,.addr =0 }, { -PTRACE_POKEDATA ,.addr =1 }, { -PTRACE_POKEDATA ,.addr =2 }, { -PTRACE_POKEDATA ,.addr =3 }, { -PTRACE_POKEDATA ,.addr =-1 }, { -PTRACE_POKEDATA ,.addr =-2 }, { -PTRACE_POKEDATA ,.addr =-3 }, { -PTRACE_POKEDATA ,.addr =-4 }, { -PTRACE_POKETEXT ,.addr =0 }, { -PTRACE_POKETEXT ,.addr =1 }, { -PTRACE_POKETEXT ,.addr =2 }, { -PTRACE_POKETEXT ,.addr =3 }, { -PTRACE_POKETEXT ,.addr =-1 }, { -PTRACE_POKETEXT ,.addr =-2 }, { -PTRACE_POKETEXT ,.addr =-3 }, { -PTRACE_POKETEXT ,.addr =-4 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +1 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +2 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +3 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +4 }, { -PTRACE_POKEUSER ,.addr =-1 }, { -PTRACE_POKEUSER ,.addr =-2 }, { -PTRACE_POKEUSER ,.addr =-3 }, { -PTRACE_POKEUSER ,.addr =-4 }, +PTRACE_PEEKDATA , .addr =0 }, { +PTRACE_PEEKDATA , .addr =1 }, { +PTRACE_PEEKDATA , .addr =2 }, { +PTRACE_PEEKDATA , .addr =3 }, { +PTRACE_PEEKDATA , .addr =-1 }, { +PTRACE_PEEKDATA , .addr =-2 }, { +PTRACE_PEEKDATA , .addr =-3 }, { +PTRACE_PEEKDATA , .addr =-4 }, { +PTRACE_PEEKTEXT , .addr =0 }, { +PTRACE_PEEKTEXT , .addr =1 }, { +PTRACE_PEEKTEXT , .addr =2 }, { +PTRACE_PEEKTEXT , .addr =3 }, { +PTRACE_PEEKTEXT , .addr =-1 }, { +PTRACE_PEEKTEXT , .addr =-2 }, { +PTRACE_PEEKTEXT , .addr =-3 }, { +PTRACE_PEEKTEXT , .addr =-4 }, { +PTRACE_PEEKUSER , .addr =SIZEOF_USER +1 }, { +PTRACE_PEEKUSER , .addr =SIZEOF_USER +2 }, { +PTRACE_PEEKUSER , .addr =SIZEOF_USER +3 }, { +PTRACE_PEEKUSER , .addr =SIZEOF_USER +4 }, { +PTRACE_PEEKUSER , .addr =-1 }, { +PTRACE_PEEKUSER , .addr =-2 }, { +PTRACE_PEEKUSER , .addr =-3 }, { +PTRACE_PEEKUSER , .addr =-4 }, { +PTRACE_POKEDATA , .addr =0 }, { +PTRACE_POKEDATA , .addr =1 }, { +PTRACE_POKEDATA , .addr =2 }, { +PTRACE_POKEDATA , .addr =3 }, { +PTRACE_POKEDATA , .addr =-1 }, { +PTRACE_POKEDATA , .addr =-2 }, { +PTRACE_POKEDATA , .addr =-3 }, { +PTRACE_POKEDATA , .addr =-4 }, { +PTRACE_POKETEXT , .addr =0 }, { +PTRACE_POKETEXT , .addr =1 }, { +PTRACE_POKETEXT , .addr =2 }, { +PTRACE_POKETEXT , .addr =3 }, { +PTRACE_POKETEXT , .addr =-1 }, { +PTRACE_POKETEXT , .addr =-2 }, { +PTRACE_POKETEXT , .addr =-3 }, { +PTRACE_POKETEXT , .addr =-4 }, { +PTRACE_POKEUSER , .addr =SIZEOF_USER +1 }, { +PTRACE_POKEUSER , .addr =SIZEOF_USER +2 }, { +PTRACE_POKEUSER , .addr =SIZEOF_USER +3 }, { +PTRACE_POKEUSER , .addr =SIZEOF_USER +4 }, { +PTRACE_POKEUSER , .addr =-1 }, { +PTRACE_POKEUSER , .addr =-2 }, { +PTRACE_POKEUSER , .addr =-3 }, { +PTRACE_POKEUSER , .addr =-4 }, #ifdef PTRACE_GETREGS { -PTRACE_GETREGS ,.data =0 }, { -PTRACE_GETREGS ,.data =1 }, { -PTRACE_GETREGS ,.data =2 }, { -PTRACE_GETREGS ,.data =3 }, { -PTRACE_GETREGS ,.data =-1 }, { -PTRACE_GETREGS ,.data =-2 }, { -PTRACE_GETREGS ,.data =-3 }, { -PTRACE_GETREGS ,.data =-4 }, +PTRACE_GETREGS , .data =0 }, { +PTRACE_GETREGS , .data =1 }, { +PTRACE_GETREGS , .data =2 }, { +PTRACE_GETREGS , .data =3 }, { +PTRACE_GETREGS , .data =-1 }, { +PTRACE_GETREGS , .data =-2 }, { +PTRACE_GETREGS , .data =-3 }, { +PTRACE_GETREGS , .data =-4 }, #endif #ifdef PTRACE_GETFGREGS { -PTRACE_GETFGREGS ,.data =0 }, { -PTRACE_GETFGREGS ,.data =1 }, { -PTRACE_GETFGREGS ,.data =2 }, { -PTRACE_GETFGREGS ,.data =3 }, { -PTRACE_GETFGREGS ,.data =-1 }, { -PTRACE_GETFGREGS ,.data =-2 }, { -PTRACE_GETFGREGS ,.data =-3 }, { -PTRACE_GETFGREGS ,.data =-4 }, +PTRACE_GETFGREGS , .data =0 }, { +PTRACE_GETFGREGS , .data =1 }, { +PTRACE_GETFGREGS , .data =2 }, { +PTRACE_GETFGREGS , .data =3 }, { +PTRACE_GETFGREGS , .data =-1 }, { +PTRACE_GETFGREGS , .data =-2 }, { +PTRACE_GETFGREGS , .data =-3 }, { +PTRACE_GETFGREGS , .data =-4 }, #endif #ifdef PTRACE_SETREGS { -PTRACE_SETREGS ,.data =0 }, { -PTRACE_SETREGS ,.data =1 }, { -PTRACE_SETREGS ,.data =2 }, { -PTRACE_SETREGS ,.data =3 }, { -PTRACE_SETREGS ,.data =-1 }, { -PTRACE_SETREGS ,.data =-2 }, { -PTRACE_SETREGS ,.data =-3 }, { -PTRACE_SETREGS ,.data =-4 }, +PTRACE_SETREGS , .data =0 }, { +PTRACE_SETREGS , .data =1 }, { +PTRACE_SETREGS , .data =2 }, { +PTRACE_SETREGS , .data =3 }, { +PTRACE_SETREGS , .data =-1 }, { +PTRACE_SETREGS , .data =-2 }, { +PTRACE_SETREGS , .data =-3 }, { +PTRACE_SETREGS , .data =-4 }, #endif #ifdef PTRACE_SETFGREGS { -PTRACE_SETFGREGS ,.data =0 }, { -PTRACE_SETFGREGS ,.data =1 }, { -PTRACE_SETFGREGS ,.data =2 }, { -PTRACE_SETFGREGS ,.data =3 }, { -PTRACE_SETFGREGS ,.data =-1 }, { -PTRACE_SETFGREGS ,.data =-2 }, { -PTRACE_SETFGREGS ,.data =-3 }, { -PTRACE_SETFGREGS ,.data =-4 }, +PTRACE_SETFGREGS , .data =0 }, { +PTRACE_SETFGREGS , .data =1 }, { +PTRACE_SETFGREGS , .data =2 }, { +PTRACE_SETFGREGS , .data =3 }, { +PTRACE_SETFGREGS , .data =-1 }, { +PTRACE_SETFGREGS , .data =-2 }, { +PTRACE_SETFGREGS , .data =-3 }, { +PTRACE_SETFGREGS , .data =-4 }, #endif #if HAVE_DECL_PTRACE_GETSIGINFO { -PTRACE_GETSIGINFO ,.data =0 }, { -PTRACE_GETSIGINFO ,.data =1 }, { -PTRACE_GETSIGINFO ,.data =2 }, { -PTRACE_GETSIGINFO ,.data =3 }, { -PTRACE_GETSIGINFO ,.data =-1 }, { -PTRACE_GETSIGINFO ,.data =-2 }, { -PTRACE_GETSIGINFO ,.data =-3 }, { -PTRACE_GETSIGINFO ,.data =-4 }, +PTRACE_GETSIGINFO , .data =0 }, { +PTRACE_GETSIGINFO , .data =1 }, { +PTRACE_GETSIGINFO , .data =2 }, { +PTRACE_GETSIGINFO , .data =3 }, { +PTRACE_GETSIGINFO , .data =-1 }, { +PTRACE_GETSIGINFO , .data =-2 }, { +PTRACE_GETSIGINFO , .data =-3 }, { +PTRACE_GETSIGINFO , .data =-4 }, #endif #if HAVE_DECL_PTRACE_SETSIGINFO { -PTRACE_SETSIGINFO ,.data =0 }, { -PTRACE_SETSIGINFO ,.data =1 }, { -PTRACE_SETSIGINFO ,.data =2 }, { -PTRACE_SETSIGINFO ,.data =3 }, { -PTRACE_SETSIGINFO ,.data =-1 }, { -PTRACE_SETSIGINFO ,.data =-2 }, { -PTRACE_SETSIGINFO ,.data =-3 }, { -PTRACE_SETSIGINFO ,.data =-4 }, +PTRACE_SETSIGINFO , .data =0 }, { +PTRACE_SETSIGINFO , .data =1 }, { +PTRACE_SETSIGINFO , .data =2 }, { +PTRACE_SETSIGINFO , .data =3 }, { +PTRACE_SETSIGINFO , .data =-1 }, { +PTRACE_SETSIGINFO , .data =-2 }, { +PTRACE_SETSIGINFO , .data =-3 }, { +PTRACE_SETSIGINFO , .data =-4 }, +#endif +}; + +#define SPT (x) [PTRACE_##x] = #x, +static char *strings[] = { + SPT(TRACEME) + SPT(PEEKTEXT) + SPT(PEEKDATA) + SPT(PEEKUSER) + SPT(POKETEXT) + SPT(POKEDATA) + SPT(POKEUSER) +#ifdef PTRACE_GETREGS + SPT(GETREGS) +#endif +#ifdef PTRACE_SETREGS + SPT(SETREGS) +#endif +#ifdef PTRACE_GETSIGINFO + SPT(GETSIGINFO) +#endif +#ifdef PTRACE_SETSIGINFO + SPT(SETSIGINFO) +#endif +#ifdef PTRACE_GETFGREGS + SPT(GETFGREGS) +#endif +#ifdef PTRACE_SETFGREGS + SPT(SETFGREGS) #endif + SPT(KILL) +SPT (SINGLESTEP ) };
testcases/kernel/syscalls/ptrace/ptrace06.c line 198
Quoted 10 lines
testcases/kernel/syscalls/ptrace/ptrace06.c +9
-1-int TST_TOTAL =ARRAY_SIZE (test_cases); +static inline char *strptrace (int request) +{ +return strings[request]; +} + +static void child (void ) +{ +SAFE_PTRACE (PTRACE_TRACEME ,0 ,NULL ,NULL ); +execl ("/bin/echo" ,"/bin/echo" ,NULL );
This isn't guaranteed to exist.
Signature · 5 lines
Thank you, Richard. -- Mailing list info: https://lists.linux.it/listinfo/ltp
v2 cover ptrace: Refactor
In reply to Wei Gao via ltpWei Gao (2):
ptrace05: Refactor the test using new LTP API
ptrace06: Refactor the test using new LTP API
testcases/kernel/syscalls/ptrace/ptrace05.c | 179 +++------- testcases/kernel/syscalls/ptrace/ptrace06.c | 326 ++++++++++-------- .../kernel/syscalls/ptrace/ptrace06_child.c | 16 + 3 files changed, 252 insertions(+), 269 deletions(-) create mode 100644 testcases/kernel/syscalls/ptrace/ptrace06_child.c
Signature · 5 lines
2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v2 1/2 ptrace05: Refactor the test using new LTP API
--- testcases/kernel/syscalls/ptrace/ptrace05.c | 179 ++++++-------------- 1 file changed, 50 insertions(+), 129 deletions(-)
testcases/kernel/syscalls/ptrace/ptrace05.c +50 -129
@@ -1,178 +1,99 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* -****************************************************************************** -* -* ptrace05 - an app which ptraces itself as per arbitrarily specified signals, -* over a user specified range. -* -* Copyright (C) 2009, Ngie Cooper -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. +* Copyright (c) Linux Test Project, 2009-2019 +* Copyright (C) 2009, Ngie Cooper +* Copyright (c) 2023 Wei Gao <[email protected]> +*/ + +/*\ +* [Description] * -* You should have received a copy of the GNU General Public License along -* with this program; if not, write to the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +* This test ptraces itself as per arbitrarily specified signals, +* over 0 to SIGRTMAX range. * -****************************************************************************** */ -#include <sys/types.h> -#include <sys/wait.h> -#include <signal.h> -#include <errno.h> -#include <libgen.h> -#include <math.h> #include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <unistd.h> #include <sys/ptrace.h> - -#include "test.h" #include "lapi/signal.h" +#include "tst_test.h" -char *TCID ="ptrace05" ; -int TST_TOTAL =0 ; - -int usage (const char *); - -int usage (const char *argv0) -{ -fprintf (stderr,"usage: %s [start-signum] [end-signum]\n" , argv0); -return 1 ; -} - -int main (int argc,char **argv) +static void run (void ) { -int end_signum =-1 ; -int signum; -int start_signum =-1 ; +int signum =0 ;int status;pid_t child; -tst_parse_opts (argc, argv,NULL ,NULL ); - -if (start_signum ==-1 ) { - start_signum =0 ; - } -if (end_signum ==-1 ) { - end_signum =SIGRTMAX ; - } - -for (signum = start_signum; signum <= end_signum; signum++) { - +for (signum =0 ; signum <=SIGRTMAX ; signum++) {if (signum >= __SIGRTMIN && signum <SIGRTMIN )continue ; -switch (child =fork ()) { -case -1 : -tst_brkm (TBROK |TERRNO ,NULL ,"fork() failed" ); -case 0 : + child =SAFE_FORK (); -if (ptrace (PTRACE_TRACEME ,0 ,NULL ,NULL ) !=-1 ) { -tst_resm (TINFO ,"[child] Sending kill(.., %d)" , - signum); -if (kill (getpid (), signum) <0 ) { -tst_resm (TINFO |TERRNO , -"[child] kill(.., %d) failed." , - signum); - } +if (child ==0 ) { +TEST (ptrace (PTRACE_TRACEME ,0 ,NULL ,NULL )); +if (TST_RET !=-1 ) { +tst_res (TINFO ,"[child] Sending kill(.., %d)" , + signum); +SAFE_KILL (getpid (), signum); }else { - -/* -* This won't increment the TST_COUNT var. -* properly, but it'll show up as a failure -* nonetheless. -*/ -tst_resm (TFAIL |TERRNO , -"Failed to ptrace(PTRACE_TRACEME, ...) " -"properly" ); - +tst_brk (TFAIL |TERRNO , +"Failed to ptrace(PTRACE_TRACEME, ...) " +"properly" ); } +/* Shouldn't get here if signum == 0. */ exit ((signum ==0 ?0 :2 )); -break ; - -default : - -waitpid (child, &status,0 ); + }else { +SAFE_WAITPID (child, &status,0 );switch (signum) {case 0 :if (WIFEXITED (status) &&WEXITSTATUS (status) ==0 ) { -tst_resm (TPASS , -"kill(.., 0) exited " -"with 0, as expected." ); +tst_res (TPASS , +"kill(.., 0) exited with 0, as expected." ); }else { -tst_resm (TFAIL , -"kill(.., 0) didn't exit " -"with 0." ); +tst_brk (TFAIL |TERRNO , +"kill(.., 0) didn't exit with 0." ); }break ;case SIGKILL :if (WIFSIGNALED (status)) {/* SIGKILL must be uncatchable. */ if (WTERMSIG (status) ==SIGKILL ) { -tst_resm (TPASS , -"Killed with SIGKILL, " -"as expected." ); +tst_res (TPASS , +"Killed with SIGKILL, as expected." ); }else { -tst_resm (TPASS , -"Didn't die with " -"SIGKILL (?!) " ); +tst_brk (TFAIL |TERRNO , +"Didn't die with SIGKILL (?!) " ); } }else if (WIFEXITED (status)) { -tst_resm (TFAIL , -"Exited unexpectedly instead " -"of dying with SIGKILL." ); +tst_res (TFAIL |TERRNO , +"Exited unexpectedly instead of dying with SIGKILL." ); }else if (WIFSTOPPED (status)) { -tst_resm (TFAIL , -"Stopped instead of dying " -"with SIGKILL." ); +tst_res (TFAIL |TERRNO , +"Stopped instead of dying with SIGKILL." ); }break ;/* All other processes should be stopped. */ default : -if (WIFSTOPPED (status)) { -tst_resm (TPASS ,"Stopped as expected" ); - }else { -tst_resm (TFAIL ,"Didn't stop as " -"expected." ); -if (kill (child,0 )) { -tst_resm (TINFO , -"Is still alive!?" ); - }else if (WIFEXITED (status)) { -tst_resm (TINFO , -"Exited normally" ); - }else if (WIFSIGNALED (status)) { -tst_resm (TINFO , -"Was signaled with " -"signum=%d" , -WTERMSIG (status)); - } - - } - +if (WIFSTOPPED (status)) +tst_res (TPASS ,"Stopped as expected" ); +else +tst_res (TFAIL |TERRNO ,"Didn't stop as expected." );break ; - } } -/* Make sure the child dies a quick and painless death ... */ -kill (child,9 ); - +if (signum !=0 && signum !=SIGKILL ) +SAFE_PTRACE (PTRACE_CONT , child,NULL ,NULL ); } - -tst_exit (); - } + +static struct tst_test test = { + .test_all = run, + .forks_child =1 , +};
Signature · 5 lines
2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v2 1/2] ptrace05: Refactor the test using new LTP API
Hi!
Quoted 81 lines · Wei Gao via ltp
Signed-off-by Wei Gao <[email protected]>---
testcases/kernel/syscalls/ptrace/ptrace05.c| 179 ++++++--------------1 file changed, 50 insertions(+), 129 deletions(-)testcases/kernel/syscalls/ptrace/ptrace05.c +1
-8@@ -1,178 +1,99 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* -****************************************************************************** -* -* ptrace05 - an app which ptraces itself as per arbitrarily specified signals, -* over a user specified range. -* -* Copyright (C) 2009, Ngie Cooper -* -* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * Copyright (c) Linux Test Project, 2009-2019
+ * Copyright (C) 2009, Ngie Cooper
+ * Copyright (c) 2023 Wei Gao <[email protected]>
+ */testcases/kernel/syscalls/ptrace/ptrace05.c +3
-0+ +/*\ +* [Description] *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * This test ptraces itself as per arbitrarily specified signals,
+ * over 0 to SIGRTMAX range.
*
-
******************************************************************************
*/testcases/kernel/syscalls/ptrace/ptrace05.c +0
-6-#include <sys/types.h> -#include <sys/wait.h> -#include <signal.h> -#include <errno.h> -#include <libgen.h> -#include <math.h> #include <
stdlib.h>testcases/kernel/syscalls/ptrace/ptrace05.c +0
-3-#include <stdio.h> -#include <string.h> -#include <unistd.h> #include <
sys/ptrace.h>testcases/kernel/syscalls/ptrace/ptrace05.c +0
-2- -#include "test.h" #include "
lapi/signal.h"testcases/kernel/syscalls/ptrace/ptrace05.c +2
-12+#include "tst_test.h" -char *TCID ="ptrace05" ; -int TST_TOTAL =0 ; - -int usage (const char *); - -int usage (const char *argv0) -{ - fprintf(stderr, "usage: %s [start-signum] [end-signum]\n", argv0); - return 1; -} - -int main (int argc,char **argv) +static void run (void )
Quoted 2 lines
{
new line to remove
Quoted 6 lines
- int
end_signum= -1;
- int signum;
- intstart_signum= -1;
+ int signum = 0;
int status;
new line to remove
Quoted 56 lines
pid_t child;
-
tst_parse_opts(argc, argv, NULL, NULL);testcases/kernel/syscalls/ptrace/ptrace05.c +1
-10- - if (start_signum == -1) { - start_signum = 0; - } - if (end_signum == -1) { - end_signum = SIGRTMAX; - } - - for (signum = start_signum; signum <= end_signum; signum++) { - + for (signum = 0; signum <= SIGRTMAX; signum++) {if (signum >=
__SIGRTMIN&& signum < SIGRTMIN) continue;- switch (child =
fork()) {
- case -1:
-tst_brkm(TBROK | TERRNO, NULL, "fork() failed"); - case 0:
+ child =SAFE_FORK();- if (
ptrace(PTRACE_TRACEME, 0, NULL, NULL)!= -1) { -tst_resm(TINFO, "[child] Sending kill(.., %d)", - signum);
- if (kill(getpid(), signum)< 0) {
- tst_resm(TINFO | TERRNO,
- "[child]kill(.., %d)failed.", - signum);
- }
+ if (child == 0) {
+TEST(ptrace(PTRACE_TRACEME, 0, NULL, NULL)); + if (TST_RET!= -1) {
+tst_res(TINFO, "[child] Sending kill(.., %d)", + signum);
+SAFE_KILL(getpid(), signum);
} else {testcases/kernel/syscalls/ptrace/ptrace05.c +3
-10- - /* - * This won't increment the TST_COUNT var. - * properly, but it'll show up as a failure - * nonetheless. - */ - tst_resm(TFAIL | TERRNO, - "Failed to ptrace(PTRACE_TRACEME, ...) " - "properly"); - + tst_brk(TFAIL | TERRNO, + "Failed to ptrace(PTRACE_TRACEME, ...) " + "properly");}
+
/* Shouldn't get here if signum == 0. */ exit((signum == 0 ? 0 : 2));
- break;
testcases/kernel/syscalls/ptrace/ptrace05.c line 49
Quoted 5 lines
testcases/kernel/syscalls/ptrace/ptrace05.c +1
-4- - default: - - waitpid(child, &status, 0); + } else {
I would remove the "else" statement, because we don't really need it once we handle the child and it creates more indentation.
Quoted 76 lines
+
SAFE_WAITPID(child, &status, 0);switch (signum) {
case 0:
if (WIFEXITED(status)
&& WEXITSTATUS(status) == 0) {
- tst_resm(TPASS,
- "kill(.., 0)exited "
- "with 0, as expected.");
+ tst_res(TPASS,
+ "kill(.., 0)exited with 0, as expected."); } else {
- tst_resm(TFAIL,
- "kill(.., 0)didn't exit "
- "with 0.");
+ tst_brk(TFAIL | TERRNO,
+ "kill(.., 0)didn't exit with 0."); }
break;
case SIGKILL:
if (WIFSIGNALED(status)) {
/* SIGKILL must be uncatchable. */
if (WTERMSIG(status) == SIGKILL) {
- tst_resm(TPASS,
- "Killed with SIGKILL, "
- "as expected.");
+ tst_res(TPASS,
+ "Killed with SIGKILL, as expected."); } else {
- tst_resm(TPASS,
- "Didn't die with "
- "SIGKILL (?!) ");
+ tst_brk(TFAIL | TERRNO,
+ "Didn't die with SIGKILL (?!) "); }
} else if (WIFEXITED(status)) {
- tst_resm(TFAIL,
- "Exited unexpectedly instead "
- "of dying with SIGKILL.");
+ tst_res(TFAIL | TERRNO,
+ "Exited unexpectedly instead of dying with SIGKILL.");
} else if (WIFSTOPPED(status)) {
- tst_resm(TFAIL,
- "Stopped instead of dying "
- "with SIGKILL.");
+ tst_res(TFAIL | TERRNO,
+ "Stopped instead of dying with SIGKILL."); }
break;
/* All other processes should be stopped. */ default:
- if (WIFSTOPPED(status)) {
-tst_resm(TPASS, "Stopped as expected"); - } else {
- tst_resm(TFAIL, "Didn't stop as "
- "expected.");
- if (kill(child, 0)) {
- tst_resm(TINFO,
- "Is still alive!?");
- } else if (WIFEXITED(status)) {
- tst_resm(TINFO,
- "Exited normally");
- } else if (WIFSIGNALED(status)) {
- tst_resm(TINFO,
- "Was signaled with "
- "signum=%d",
- WTERMSIG(status));
- }testcases/kernel/syscalls/ptrace/ptrace05.c +4
-3- - } - + if (WIFSTOPPED(status)) + tst_res(TPASS, "Stopped as expected"); + else + tst_res(TFAIL | TERRNO, "Didn't stop as expected.");
Quoted 4 lines
break;
-
}
new line to remove :-) I know it can be boring, but please keep new line where it's needed.
Quoted 4 lines
}
- /* Make sure the child dies a quick and painless death ... */ -kill(child, 9);
-
new line to add
testcases/kernel/syscalls/ptrace/ptrace05.c line 99
Quoted 12 lines
+ if (signum != 0 && signum != SIGKILL)
+SAFE_PTRACE(PTRACE_CONT, child, NULL, NULL); }testcases/kernel/syscalls/ptrace/ptrace05.c +0
-3- - tst_exit(); -}
testcases/kernel/syscalls/ptrace/ptrace05.c +5
-0+ +static struct tst_test test = { + .test_all = run, + .forks_child = 1, +};
Besides a few stylish things, it's fine.
Regards,
Andrea Cervesato
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v2 2/2 ptrace06: Refactor the test using new LTP API
In reply to Wei Gao via ltp--- testcases/kernel/syscalls/ptrace/ptrace06.c | 326 ++++++++++-------- .../kernel/syscalls/ptrace/ptrace06_child.c | 16 + 2 files changed, 202 insertions(+), 140 deletions(-) create mode 100644 testcases/kernel/syscalls/ptrace/ptrace06_child.c
testcases/kernel/syscalls/ptrace/ptrace06.c +186 -140
@@ -1,29 +1,28 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* +* Copyright (c) 2008 Analog Devices Inc. +* Copyright (c) Linux Test Project, 2009-2022 +* Copyright (c) 2023 Wei Gao <[email protected]> +*/ + +/*\ +* [Description] +* * check out-of-bound/unaligned addresses given to +* * - {PEEK,POKE}{DATA,TEXT,USER} * - {GET,SET}{,FG}REGS * - {GET,SET}SIGINFO -* -* Copyright (c) 2008 Analog Devices Inc. -* -* Licensed under the GPL-2 or later */ -#define _GNU_SOURCE - -#include <errno.h> -#include <stdbool.h> -#include <stdio.h> #include <stdlib.h> -#include <unistd.h> #include <sys/ptrace.h> - -#include "test.h" -#include "spawn_ptrace_child.h" +#include "tst_test.h" /* this should be sizeof(struct user), but that info is only found * in the kernel asm/user.h which is not exported to userspace. */ +#if defined(__i386__)#define SIZEOF_USER 284#elif defined(__x86_64__)
@@ -32,168 +31,215 @@#define SIZEOF_USER 0x1000/* just pick a big number */ #endif -char *TCID ="ptrace06" ; - -struct test_case_t { +static struct test_case_t {int request;long addr;long data; } test_cases[] = { - { -PTRACE_PEEKDATA ,.addr =0 }, { -PTRACE_PEEKDATA ,.addr =1 }, { -PTRACE_PEEKDATA ,.addr =2 }, { -PTRACE_PEEKDATA ,.addr =3 }, { -PTRACE_PEEKDATA ,.addr =-1 }, { -PTRACE_PEEKDATA ,.addr =-2 }, { -PTRACE_PEEKDATA ,.addr =-3 }, { -PTRACE_PEEKDATA ,.addr =-4 }, { -PTRACE_PEEKTEXT ,.addr =0 }, { -PTRACE_PEEKTEXT ,.addr =1 }, { -PTRACE_PEEKTEXT ,.addr =2 }, { -PTRACE_PEEKTEXT ,.addr =3 }, { -PTRACE_PEEKTEXT ,.addr =-1 }, { -PTRACE_PEEKTEXT ,.addr =-2 }, { -PTRACE_PEEKTEXT ,.addr =-3 }, { -PTRACE_PEEKTEXT ,.addr =-4 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +1 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +2 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +3 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +4 }, { -PTRACE_PEEKUSER ,.addr =-1 }, { -PTRACE_PEEKUSER ,.addr =-2 }, { -PTRACE_PEEKUSER ,.addr =-3 }, { -PTRACE_PEEKUSER ,.addr =-4 }, { -PTRACE_POKEDATA ,.addr =0 }, { -PTRACE_POKEDATA ,.addr =1 }, { -PTRACE_POKEDATA ,.addr =2 }, { -PTRACE_POKEDATA ,.addr =3 }, { -PTRACE_POKEDATA ,.addr =-1 }, { -PTRACE_POKEDATA ,.addr =-2 }, { -PTRACE_POKEDATA ,.addr =-3 }, { -PTRACE_POKEDATA ,.addr =-4 }, { -PTRACE_POKETEXT ,.addr =0 }, { -PTRACE_POKETEXT ,.addr =1 }, { -PTRACE_POKETEXT ,.addr =2 }, { -PTRACE_POKETEXT ,.addr =3 }, { -PTRACE_POKETEXT ,.addr =-1 }, { -PTRACE_POKETEXT ,.addr =-2 }, { -PTRACE_POKETEXT ,.addr =-3 }, { -PTRACE_POKETEXT ,.addr =-4 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +1 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +2 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +3 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +4 }, { -PTRACE_POKEUSER ,.addr =-1 }, { -PTRACE_POKEUSER ,.addr =-2 }, { -PTRACE_POKEUSER ,.addr =-3 }, { -PTRACE_POKEUSER ,.addr =-4 }, + {PTRACE_PEEKDATA , .addr =0 }, + {PTRACE_PEEKDATA , .addr =1 }, + {PTRACE_PEEKDATA , .addr =2 }, + {PTRACE_PEEKDATA , .addr =3 }, + {PTRACE_PEEKDATA , .addr =-1 }, + {PTRACE_PEEKDATA , .addr =-2 }, + {PTRACE_PEEKDATA , .addr =-3 }, + {PTRACE_PEEKDATA , .addr =-4 }, + {PTRACE_PEEKTEXT , .addr =0 }, + {PTRACE_PEEKTEXT , .addr =1 }, + {PTRACE_PEEKTEXT , .addr =2 }, + {PTRACE_PEEKTEXT , .addr =3 }, + {PTRACE_PEEKTEXT , .addr =-1 }, + {PTRACE_PEEKTEXT , .addr =-2 }, + {PTRACE_PEEKTEXT , .addr =-3 }, + {PTRACE_PEEKTEXT , .addr =-4 }, + {PTRACE_PEEKUSER , .addr =SIZEOF_USER +1 }, + {PTRACE_PEEKUSER , .addr =SIZEOF_USER +2 }, + {PTRACE_PEEKUSER , .addr =SIZEOF_USER +3 }, + {PTRACE_PEEKUSER , .addr =SIZEOF_USER +4 }, + {PTRACE_PEEKUSER , .addr =-1 }, + {PTRACE_PEEKUSER , .addr =-2 }, + {PTRACE_PEEKUSER , .addr =-3 }, + {PTRACE_PEEKUSER , .addr =-4 }, + {PTRACE_POKEDATA , .addr =0 }, + {PTRACE_POKEDATA , .addr =1 }, + {PTRACE_POKEDATA , .addr =2 }, + {PTRACE_POKEDATA , .addr =3 }, + {PTRACE_POKEDATA , .addr =-1 }, + {PTRACE_POKEDATA , .addr =-2 }, + {PTRACE_POKEDATA , .addr =-3 }, + {PTRACE_POKEDATA , .addr =-4 }, + {PTRACE_POKETEXT , .addr =0 }, + {PTRACE_POKETEXT , .addr =1 }, + {PTRACE_POKETEXT , .addr =2 }, + {PTRACE_POKETEXT , .addr =3 }, + {PTRACE_POKETEXT , .addr =-1 }, + {PTRACE_POKETEXT , .addr =-2 }, + {PTRACE_POKETEXT , .addr =-3 }, + {PTRACE_POKETEXT , .addr =-4 }, + {PTRACE_POKEUSER , .addr =SIZEOF_USER +1 }, + {PTRACE_POKEUSER , .addr =SIZEOF_USER +2 }, + {PTRACE_POKEUSER , .addr =SIZEOF_USER +3 }, + {PTRACE_POKEUSER , .addr =SIZEOF_USER +4 }, + {PTRACE_POKEUSER , .addr =-1 }, + {PTRACE_POKEUSER , .addr =-2 }, + {PTRACE_POKEUSER , .addr =-3 }, + {PTRACE_POKEUSER , .addr =-4 }, #ifdef PTRACE_GETREGS - { -PTRACE_GETREGS ,.data =0 }, { -PTRACE_GETREGS ,.data =1 }, { -PTRACE_GETREGS ,.data =2 }, { -PTRACE_GETREGS ,.data =3 }, { -PTRACE_GETREGS ,.data =-1 }, { -PTRACE_GETREGS ,.data =-2 }, { -PTRACE_GETREGS ,.data =-3 }, { -PTRACE_GETREGS ,.data =-4 }, + {PTRACE_GETREGS , .data =0 }, + {PTRACE_GETREGS , .data =1 }, + {PTRACE_GETREGS , .data =2 }, + {PTRACE_GETREGS , .data =3 }, + {PTRACE_GETREGS , .data =-1 }, + {PTRACE_GETREGS , .data =-2 }, + {PTRACE_GETREGS , .data =-3 }, + {PTRACE_GETREGS , .data =-4 }, #endif #ifdef PTRACE_GETFGREGS - { -PTRACE_GETFGREGS ,.data =0 }, { -PTRACE_GETFGREGS ,.data =1 }, { -PTRACE_GETFGREGS ,.data =2 }, { -PTRACE_GETFGREGS ,.data =3 }, { -PTRACE_GETFGREGS ,.data =-1 }, { -PTRACE_GETFGREGS ,.data =-2 }, { -PTRACE_GETFGREGS ,.data =-3 }, { -PTRACE_GETFGREGS ,.data =-4 }, + {PTRACE_GETFGREGS , .data =0 }, + {PTRACE_GETFGREGS , .data =1 }, + {PTRACE_GETFGREGS , .data =2 }, + {PTRACE_GETFGREGS , .data =3 }, + {PTRACE_GETFGREGS , .data =-1 }, + {PTRACE_GETFGREGS , .data =-2 }, + {PTRACE_GETFGREGS , .data =-3 }, + {PTRACE_GETFGREGS , .data =-4 }, #endif #ifdef PTRACE_SETREGS - { -PTRACE_SETREGS ,.data =0 }, { -PTRACE_SETREGS ,.data =1 }, { -PTRACE_SETREGS ,.data =2 }, { -PTRACE_SETREGS ,.data =3 }, { -PTRACE_SETREGS ,.data =-1 }, { -PTRACE_SETREGS ,.data =-2 }, { -PTRACE_SETREGS ,.data =-3 }, { -PTRACE_SETREGS ,.data =-4 }, + {PTRACE_SETREGS , .data =0 }, + {PTRACE_SETREGS , .data =1 }, + {PTRACE_SETREGS , .data =2 }, + {PTRACE_SETREGS , .data =3 }, + {PTRACE_SETREGS , .data =-1 }, + {PTRACE_SETREGS , .data =-2 }, + {PTRACE_SETREGS , .data =-3 }, + {PTRACE_SETREGS , .data =-4 }, #endif #ifdef PTRACE_SETFGREGS - { -PTRACE_SETFGREGS ,.data =0 }, { -PTRACE_SETFGREGS ,.data =1 }, { -PTRACE_SETFGREGS ,.data =2 }, { -PTRACE_SETFGREGS ,.data =3 }, { -PTRACE_SETFGREGS ,.data =-1 }, { -PTRACE_SETFGREGS ,.data =-2 }, { -PTRACE_SETFGREGS ,.data =-3 }, { -PTRACE_SETFGREGS ,.data =-4 }, + {PTRACE_SETFGREGS , .data =0 }, + {PTRACE_SETFGREGS , .data =1 }, + {PTRACE_SETFGREGS , .data =2 }, + {PTRACE_SETFGREGS , .data =3 }, + {PTRACE_SETFGREGS , .data =-1 }, + {PTRACE_SETFGREGS , .data =-2 }, + {PTRACE_SETFGREGS , .data =-3 }, + {PTRACE_SETFGREGS , .data =-4 }, #endif #if HAVE_DECL_PTRACE_GETSIGINFO - { -PTRACE_GETSIGINFO ,.data =0 }, { -PTRACE_GETSIGINFO ,.data =1 }, { -PTRACE_GETSIGINFO ,.data =2 }, { -PTRACE_GETSIGINFO ,.data =3 }, { -PTRACE_GETSIGINFO ,.data =-1 }, { -PTRACE_GETSIGINFO ,.data =-2 }, { -PTRACE_GETSIGINFO ,.data =-3 }, { -PTRACE_GETSIGINFO ,.data =-4 }, + {PTRACE_GETSIGINFO , .data =0 }, + {PTRACE_GETSIGINFO , .data =1 }, + {PTRACE_GETSIGINFO , .data =2 }, + {PTRACE_GETSIGINFO , .data =3 }, + {PTRACE_GETSIGINFO , .data =-1 }, + {PTRACE_GETSIGINFO , .data =-2 }, + {PTRACE_GETSIGINFO , .data =-3 }, + {PTRACE_GETSIGINFO , .data =-4 }, #endif #if HAVE_DECL_PTRACE_SETSIGINFO - { -PTRACE_SETSIGINFO ,.data =0 }, { -PTRACE_SETSIGINFO ,.data =1 }, { -PTRACE_SETSIGINFO ,.data =2 }, { -PTRACE_SETSIGINFO ,.data =3 }, { -PTRACE_SETSIGINFO ,.data =-1 }, { -PTRACE_SETSIGINFO ,.data =-2 }, { -PTRACE_SETSIGINFO ,.data =-3 }, { -PTRACE_SETSIGINFO ,.data =-4 }, + {PTRACE_SETSIGINFO , .data =0 }, + {PTRACE_SETSIGINFO , .data =1 }, + {PTRACE_SETSIGINFO , .data =2 }, + {PTRACE_SETSIGINFO , .data =3 }, + {PTRACE_SETSIGINFO , .data =-1 }, + {PTRACE_SETSIGINFO , .data =-2 }, + {PTRACE_SETSIGINFO , .data =-3 }, + {PTRACE_SETSIGINFO , .data =-4 }, #endif }; -int TST_TOTAL =ARRAY_SIZE (test_cases); +#define SPT (x) [PTRACE_##x] = #x, +static char *strings[] = { + SPT(TRACEME) + SPT(PEEKTEXT) + SPT(PEEKDATA) + SPT(PEEKUSER) + SPT(POKETEXT) + SPT(POKEDATA) + SPT(POKEUSER) +#ifdef PTRACE_GETREGS + SPT(GETREGS) +#endif +#ifdef PTRACE_SETREGS + SPT(SETREGS) +#endif +#ifdef PTRACE_GETSIGINFO + SPT(GETSIGINFO) +#endif +#ifdef PTRACE_SETSIGINFO + SPT(SETSIGINFO) +#endif +#ifdef PTRACE_GETFGREGS + SPT(GETFGREGS) +#endif +#ifdef PTRACE_SETFGREGS + SPT(SETFGREGS) +#endif + SPT(KILL) +SPT (SINGLESTEP ) +}; + +static inline char *strptrace (int request) +{ +return strings[request]; +} + +static void child (void ) +{ -int main (int argc,char *argv[]) +char path[512 ]; + +SAFE_PTRACE (PTRACE_TRACEME ,0 ,NULL ,NULL ); + +if (tst_get_path ("ptrace06_child" , path,sizeof (path))) +tst_brk (TCONF ,"Couldn't find ptrace06_child in $PATH" ); + +TEST (execl (path,"ptrace06_child" ,"" ,NULL )); +tst_brk (TFAIL |TTERRNO , +"Failed to execute execl01_child" ); +exit (0 ); +} + +static void run (void ) {size_t i; -long ret; -int saved_errno; +int pid; +int status; -tst_parse_opts (argc, argv,NULL ,NULL ); + pid =SAFE_FORK (); -make_a_baby (argc, argv); +if (!pid) +child (); + +SAFE_WAIT (&status); + +if (!WIFSTOPPED (status)) +tst_brk (TBROK ,"child %d was not stopped" , pid);for (i =0 ; i <ARRAY_SIZE (test_cases); ++i) {struct test_case_t *tc = &test_cases[i]; - errno =0 ; - ret = -ptrace (tc->request, pid, (void *)tc->addr, - (void *)tc->data); - saved_errno = errno; -if (ret !=-1 ) -tst_resm (TFAIL , +TEST (ptrace (tc->request, pid, (void *)tc->addr, + (void *)tc->data)); +if (TST_RET !=-1 ) +tst_brk (TFAIL |TERRNO ,"ptrace(%s, ..., %li, %li) returned %li instead of -1" ,strptrace (tc->request), tc->addr, tc->data, - ret); -else if (saved_errno !=EIO && saved_errno !=EFAULT ) -tst_resm (TFAIL , +TST_RET ); +else if (TST_ERR !=EIO &&TST_ERR !=EFAULT ) +tst_brk (TFAIL |TERRNO ,"ptrace(%s, ..., %li, %li) expected errno EIO or EFAULT; actual: %i (%s)" ,strptrace (tc->request), tc->addr, tc->data, - saved_errno,strerror (saved_errno)); +TST_ERR ,strerror (TST_ERR ));else -tst_resm (TPASS , +tst_res (TPASS ,"ptrace(%s, ..., %li, %li) failed as expected" ,strptrace (tc->request), tc->addr, tc->data); } -/* hopefully this worked */ -ptrace (PTRACE_KILL , pid,NULL ,NULL ); +SAFE_PTRACE (PTRACE_CONT , pid,NULL ,NULL ); -tst_exit (); } + +static struct tst_test test = { + .test_all = run, + .forks_child =1 , +};
testcases/kernel/syscalls/ptrace/ptrace06_child.c new file +16 -0
@@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2018 Linux Test Project +* Copyright (C) 2015 Cyril Hrubis [email protected] +*/ + +#define TST_NO_DEFAULT_MAIN +#include "tst_test.h" + +int main (int argc,char *argv[]) +{ + +tst_res (TPASS ,"%s executed" , argv[0 ]); + +return 0 ; +}
Signature · 5 lines
2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v2 2/2] ptrace06: Refactor the test using new LTP API
Hi!
Quoted 408 lines · Wei Gao via ltp
Signed-off-by Wei Gao <[email protected]>---
testcases/kernel/syscalls/ptrace/ptrace06.c | 326 ++++++++++-------- .../kernel/syscalls/ptrace/ptrace06_child.c | 16 +2 files changed, 202 insertions(+), 140 deletions(-)create mode 100644
testcases/kernel/syscalls/ptrace/ptrace06_child.ctestcases/kernel/syscalls/ptrace/ptrace06.c +179
-136@@ -1,29 +1,28 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* +* Copyright (c) 2008 Analog Devices Inc. +* Copyright (c) Linux Test Project, 2009-2022 +* Copyright (c) 2023 Wei Gao <[email protected]> +*/ + +/*\ +* [Description] +* * check out-of-bound/unaligned addresses given to +* * - {PEEK,POKE}{DATA,TEXT,USER} * - {GET,SET}{,FG}REGS * - {GET,SET}SIGINFO -* -* Copyright (c) 2008 Analog Devices Inc. -* -* Licensed under the GPL-2 or later */ -#define _GNU_SOURCE - -#include <errno.h> -#include <stdbool.h> -#include <stdio.h> #include <stdlib.h> -#include <unistd.h> #include <sys/ptrace.h> - -#include "test.h" -#include "spawn_ptrace_child.h" +#include "tst_test.h" /* this should be sizeof(struct user), but that info is only found * in the kernel asm/user.h which is not exported to userspace. */ +#if defined(__i386__)#define SIZEOF_USER 284#elif defined(__x86_64__)@@ -32,168 +31,215 @@#define SIZEOF_USER 0x1000/* just pick a big number */ #endif -char *TCID ="ptrace06" ; - -struct test_case_t { +static struct test_case_t { int request; long addr; long data; } test_cases[] = { - { - PTRACE_PEEKDATA,.addr = 0}, { - PTRACE_PEEKDATA,.addr = 1}, { - PTRACE_PEEKDATA,.addr = 2}, { - PTRACE_PEEKDATA,.addr = 3}, { - PTRACE_PEEKDATA,.addr = -1}, { - PTRACE_PEEKDATA,.addr = -2}, { - PTRACE_PEEKDATA,.addr = -3}, { - PTRACE_PEEKDATA,.addr = -4}, { - PTRACE_PEEKTEXT,.addr = 0}, { - PTRACE_PEEKTEXT,.addr = 1}, { - PTRACE_PEEKTEXT,.addr = 2}, { - PTRACE_PEEKTEXT,.addr = 3}, { - PTRACE_PEEKTEXT,.addr = -1}, { - PTRACE_PEEKTEXT,.addr = -2}, { - PTRACE_PEEKTEXT,.addr = -3}, { - PTRACE_PEEKTEXT,.addr = -4}, { - PTRACE_PEEKUSER,.addr = SIZEOF_USER + 1}, { - PTRACE_PEEKUSER,.addr = SIZEOF_USER + 2}, { - PTRACE_PEEKUSER,.addr = SIZEOF_USER + 3}, { - PTRACE_PEEKUSER,.addr = SIZEOF_USER + 4}, { - PTRACE_PEEKUSER,.addr = -1}, { - PTRACE_PEEKUSER,.addr = -2}, { - PTRACE_PEEKUSER,.addr = -3}, { - PTRACE_PEEKUSER,.addr = -4}, { - PTRACE_POKEDATA,.addr = 0}, { - PTRACE_POKEDATA,.addr = 1}, { - PTRACE_POKEDATA,.addr = 2}, { - PTRACE_POKEDATA,.addr = 3}, { - PTRACE_POKEDATA,.addr = -1}, { - PTRACE_POKEDATA,.addr = -2}, { - PTRACE_POKEDATA,.addr = -3}, { - PTRACE_POKEDATA,.addr = -4}, { - PTRACE_POKETEXT,.addr = 0}, { - PTRACE_POKETEXT,.addr = 1}, { - PTRACE_POKETEXT,.addr = 2}, { - PTRACE_POKETEXT,.addr = 3}, { - PTRACE_POKETEXT,.addr = -1}, { - PTRACE_POKETEXT,.addr = -2}, { - PTRACE_POKETEXT,.addr = -3}, { - PTRACE_POKETEXT,.addr = -4}, { - PTRACE_POKEUSER,.addr = SIZEOF_USER + 1}, { - PTRACE_POKEUSER,.addr = SIZEOF_USER + 2}, { - PTRACE_POKEUSER,.addr = SIZEOF_USER + 3}, { - PTRACE_POKEUSER,.addr = SIZEOF_USER + 4}, { - PTRACE_POKEUSER,.addr = -1}, { - PTRACE_POKEUSER,.addr = -2}, { - PTRACE_POKEUSER,.addr = -3}, { - PTRACE_POKEUSER,.addr = -4}, + {PTRACE_PEEKDATA, .addr = 0}, + {PTRACE_PEEKDATA, .addr = 1}, + {PTRACE_PEEKDATA, .addr = 2}, + {PTRACE_PEEKDATA, .addr = 3}, + {PTRACE_PEEKDATA, .addr = -1}, + {PTRACE_PEEKDATA, .addr = -2}, + {PTRACE_PEEKDATA, .addr = -3}, + {PTRACE_PEEKDATA, .addr = -4}, + {PTRACE_PEEKTEXT, .addr = 0}, + {PTRACE_PEEKTEXT, .addr = 1}, + {PTRACE_PEEKTEXT, .addr = 2}, + {PTRACE_PEEKTEXT, .addr = 3}, + {PTRACE_PEEKTEXT, .addr = -1}, + {PTRACE_PEEKTEXT, .addr = -2}, + {PTRACE_PEEKTEXT, .addr = -3}, + {PTRACE_PEEKTEXT, .addr = -4}, + {PTRACE_PEEKUSER, .addr = SIZEOF_USER + 1}, + {PTRACE_PEEKUSER, .addr = SIZEOF_USER + 2}, + {PTRACE_PEEKUSER, .addr = SIZEOF_USER + 3}, + {PTRACE_PEEKUSER, .addr = SIZEOF_USER + 4}, + {PTRACE_PEEKUSER, .addr = -1}, + {PTRACE_PEEKUSER, .addr = -2}, + {PTRACE_PEEKUSER, .addr = -3}, + {PTRACE_PEEKUSER, .addr = -4}, + {PTRACE_POKEDATA, .addr = 0}, + {PTRACE_POKEDATA, .addr = 1}, + {PTRACE_POKEDATA, .addr = 2}, + {PTRACE_POKEDATA, .addr = 3}, + {PTRACE_POKEDATA, .addr = -1}, + {PTRACE_POKEDATA, .addr = -2}, + {PTRACE_POKEDATA, .addr = -3}, + {PTRACE_POKEDATA, .addr = -4}, + {PTRACE_POKETEXT, .addr = 0}, + {PTRACE_POKETEXT, .addr = 1}, + {PTRACE_POKETEXT, .addr = 2}, + {PTRACE_POKETEXT, .addr = 3}, + {PTRACE_POKETEXT, .addr = -1}, + {PTRACE_POKETEXT, .addr = -2}, + {PTRACE_POKETEXT, .addr = -3}, + {PTRACE_POKETEXT, .addr = -4}, + {PTRACE_POKEUSER, .addr = SIZEOF_USER + 1}, + {PTRACE_POKEUSER, .addr = SIZEOF_USER + 2}, + {PTRACE_POKEUSER, .addr = SIZEOF_USER + 3}, + {PTRACE_POKEUSER, .addr = SIZEOF_USER + 4}, + {PTRACE_POKEUSER, .addr = -1}, + {PTRACE_POKEUSER, .addr = -2}, + {PTRACE_POKEUSER, .addr = -3}, + {PTRACE_POKEUSER, .addr = -4}, #ifdef PTRACE_GETREGS - { - PTRACE_GETREGS,.data = 0}, { - PTRACE_GETREGS,.data = 1}, { - PTRACE_GETREGS,.data = 2}, { - PTRACE_GETREGS,.data = 3}, { - PTRACE_GETREGS,.data = -1}, { - PTRACE_GETREGS,.data = -2}, { - PTRACE_GETREGS,.data = -3}, { - PTRACE_GETREGS,.data = -4}, + {PTRACE_GETREGS, .data = 0}, + {PTRACE_GETREGS, .data = 1}, + {PTRACE_GETREGS, .data = 2}, + {PTRACE_GETREGS, .data = 3}, + {PTRACE_GETREGS, .data = -1}, + {PTRACE_GETREGS, .data = -2}, + {PTRACE_GETREGS, .data = -3}, + {PTRACE_GETREGS, .data = -4}, #endif #ifdef PTRACE_GETFGREGS - { - PTRACE_GETFGREGS,.data = 0}, { - PTRACE_GETFGREGS,.data = 1}, { - PTRACE_GETFGREGS,.data = 2}, { - PTRACE_GETFGREGS,.data = 3}, { - PTRACE_GETFGREGS,.data = -1}, { - PTRACE_GETFGREGS,.data = -2}, { - PTRACE_GETFGREGS,.data = -3}, { - PTRACE_GETFGREGS,.data = -4}, + {PTRACE_GETFGREGS, .data = 0}, + {PTRACE_GETFGREGS, .data = 1}, + {PTRACE_GETFGREGS, .data = 2}, + {PTRACE_GETFGREGS, .data = 3}, + {PTRACE_GETFGREGS, .data = -1}, + {PTRACE_GETFGREGS, .data = -2}, + {PTRACE_GETFGREGS, .data = -3}, + {PTRACE_GETFGREGS, .data = -4}, #endif #ifdef PTRACE_SETREGS - { - PTRACE_SETREGS,.data = 0}, { - PTRACE_SETREGS,.data = 1}, { - PTRACE_SETREGS,.data = 2}, { - PTRACE_SETREGS,.data = 3}, { - PTRACE_SETREGS,.data = -1}, { - PTRACE_SETREGS,.data = -2}, { - PTRACE_SETREGS,.data = -3}, { - PTRACE_SETREGS,.data = -4}, + {PTRACE_SETREGS, .data = 0}, + {PTRACE_SETREGS, .data = 1}, + {PTRACE_SETREGS, .data = 2}, + {PTRACE_SETREGS, .data = 3}, + {PTRACE_SETREGS, .data = -1}, + {PTRACE_SETREGS, .data = -2}, + {PTRACE_SETREGS, .data = -3}, + {PTRACE_SETREGS, .data = -4}, #endif #ifdef PTRACE_SETFGREGS - { - PTRACE_SETFGREGS,.data = 0}, { - PTRACE_SETFGREGS,.data = 1}, { - PTRACE_SETFGREGS,.data = 2}, { - PTRACE_SETFGREGS,.data = 3}, { - PTRACE_SETFGREGS,.data = -1}, { - PTRACE_SETFGREGS,.data = -2}, { - PTRACE_SETFGREGS,.data = -3}, { - PTRACE_SETFGREGS,.data = -4}, + {PTRACE_SETFGREGS, .data = 0}, + {PTRACE_SETFGREGS, .data = 1}, + {PTRACE_SETFGREGS, .data = 2}, + {PTRACE_SETFGREGS, .data = 3}, + {PTRACE_SETFGREGS, .data = -1}, + {PTRACE_SETFGREGS, .data = -2}, + {PTRACE_SETFGREGS, .data = -3}, + {PTRACE_SETFGREGS, .data = -4}, #endif #if HAVE_DECL_PTRACE_GETSIGINFO - { - PTRACE_GETSIGINFO,.data = 0}, { - PTRACE_GETSIGINFO,.data = 1}, { - PTRACE_GETSIGINFO,.data = 2}, { - PTRACE_GETSIGINFO,.data = 3}, { - PTRACE_GETSIGINFO,.data = -1}, { - PTRACE_GETSIGINFO,.data = -2}, { - PTRACE_GETSIGINFO,.data = -3}, { - PTRACE_GETSIGINFO,.data = -4}, + {PTRACE_GETSIGINFO, .data = 0}, + {PTRACE_GETSIGINFO, .data = 1}, + {PTRACE_GETSIGINFO, .data = 2}, + {PTRACE_GETSIGINFO, .data = 3}, + {PTRACE_GETSIGINFO, .data = -1}, + {PTRACE_GETSIGINFO, .data = -2}, + {PTRACE_GETSIGINFO, .data = -3}, + {PTRACE_GETSIGINFO, .data = -4}, #endif #if HAVE_DECL_PTRACE_SETSIGINFO - { - PTRACE_SETSIGINFO,.data = 0}, { - PTRACE_SETSIGINFO,.data = 1}, { - PTRACE_SETSIGINFO,.data = 2}, { - PTRACE_SETSIGINFO,.data = 3}, { - PTRACE_SETSIGINFO,.data = -1}, { - PTRACE_SETSIGINFO,.data = -2}, { - PTRACE_SETSIGINFO,.data = -3}, { - PTRACE_SETSIGINFO,.data = -4}, + {PTRACE_SETSIGINFO, .data = 0}, + {PTRACE_SETSIGINFO, .data = 1}, + {PTRACE_SETSIGINFO, .data = 2}, + {PTRACE_SETSIGINFO, .data = 3}, + {PTRACE_SETSIGINFO, .data = -1}, + {PTRACE_SETSIGINFO, .data = -2}, + {PTRACE_SETSIGINFO, .data = -3}, + {PTRACE_SETSIGINFO, .data = -4}, #endif }; -int TST_TOTAL =ARRAY_SIZE (test_cases); +#define SPT (x) [PTRACE_##x] = #x, +static char *strings[] = { + SPT(TRACEME) + SPT(PEEKTEXT) + SPT(PEEKDATA) + SPT(PEEKUSER) + SPT(POKETEXT) + SPT(POKEDATA) + SPT(POKEUSER) +#ifdef PTRACE_GETREGS + SPT(GETREGS) +#endif +#ifdef PTRACE_SETREGS + SPT(SETREGS) +#endif +#ifdef PTRACE_GETSIGINFO + SPT(GETSIGINFO) +#endif +#ifdef PTRACE_SETSIGINFO + SPT(SETSIGINFO) +#endif +#ifdef PTRACE_GETFGREGS + SPT(GETFGREGS) +#endif +#ifdef PTRACE_SETFGREGS + SPT(SETFGREGS) +#endif + SPT(KILL) + SPT(SINGLESTEP) +}; + +static inline char *strptrace (int request) +{ + return strings[request]; +} + +static void child (void ) +{ -int main (int argc,char *argv[]) + char path[512]; + + SAFE_PTRACE(PTRACE_TRACEME, 0, NULL, NULL); + + if (tst_get_path("ptrace06_child", path, sizeof(path))) + tst_brk(TCONF, "Couldn't find ptrace06_child in $PATH"); + + TEST(execl(path, "ptrace06_child", "", NULL)); + tst_brk(TFAIL | TTERRNO, + "Failed to execute execl01_child"); + exit(0); +} + +static void run (void ) { size_t i; - long ret; - int saved_errno; + int pid; + int status; - tst_parse_opts(argc, argv, NULL, NULL); + pid = SAFE_FORK(); - make_a_baby(argc, argv); + if (!pid) + child(); + + SAFE_WAIT(&status); + + if (!WIFSTOPPED(status)) + tst_brk(TBROK, "child %d was not stopped", pid); for (i = 0; i < ARRAY_SIZE(test_cases); ++i) { struct test_case_t *tc = &test_cases[i]; - errno = 0; - ret = - ptrace(tc->request, pid, (void *)tc->addr, - (void *)tc->data); - saved_errno = errno; - if (ret != -1) - tst_resm(TFAIL, + TEST(ptrace(tc->request, pid, (void *)tc->addr, + (void *)tc->data)); + if (TST_RET != -1) + tst_brk(TFAIL | TERRNO, "ptrace(%s, ..., %li, %li) returned %li instead of -1", strptrace(tc->request), tc->addr, tc->data, - ret); - else if (saved_errno != EIO && saved_errno != EFAULT) - tst_resm(TFAIL, + TST_RET); + else if (TST_ERR != EIO && TST_ERR != EFAULT) + tst_brk(TFAIL | TERRNO, "ptrace(%s, ..., %li, %li) expected errno EIO or EFAULT; actual: %i (%s)", strptrace(tc->request), tc->addr, tc->data, - saved_errno, strerror(saved_errno)); + TST_ERR, strerror(TST_ERR));else
- tst_resm(TPASS,
+ tst_res(TPASS,
"ptrace(%s, ..., %li, %li)failed as expected",strptrace(tc->request),tc->addr,tc->data); }- /* hopefully this worked */
-ptrace(PTRACE_KILL, pid, NULL, NULL);
+SAFE_PTRACE(PTRACE_CONT, pid, NULL, NULL);-
tst_exit();
}testcases/kernel/syscalls/ptrace/ptrace06.c +5
-0+ +static struct tst_test test = { + .test_all = run, + .forks_child = 1, +};testcases/kernel/syscalls/ptrace/ptrace06_child.c new file +6
-0@@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2018 Linux Test Project +* Copyright (C) 2015 Cyril Hrubis [email protected] +*/ +
testcases/kernel/syscalls/ptrace/ptrace06_child.c line 16
Quoted 10 lines
testcases/kernel/syscalls/ptrace/ptrace06_child.c new file +10
-0+#define TST_NO_DEFAULT_MAIN +#include "tst_test.h" + +int main (int argc,char *argv[]) +{ + + tst_res(TPASS, "%s executed", argv[0]); + + return 0; +}
Please run "make check" before sending the patch and fix the issues. Otherwise LGTM.
Regards,
Andrea Cervesato
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
v3 cover ptrace: Refactor
In reply to Wei Gao via ltpWei Gao (2):
ptrace05: Refactor the test using new LTP API
ptrace06: Refactor the test using new LTP API
testcases/kernel/syscalls/ptrace/ptrace05.c | 215 ++++-------- testcases/kernel/syscalls/ptrace/ptrace06.c | 326 ++++++++++-------- .../kernel/syscalls/ptrace/ptrace06_child.c | 16 + 3 files changed, 269 insertions(+), 288 deletions(-) create mode 100644 testcases/kernel/syscalls/ptrace/ptrace06_child.c
Signature · 5 lines
2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v3 1/2 ptrace05: Refactor the test using new LTP API
--- testcases/kernel/syscalls/ptrace/ptrace05.c | 215 ++++++-------------- 1 file changed, 67 insertions(+), 148 deletions(-)
testcases/kernel/syscalls/ptrace/ptrace05.c +67 -148
@@ -1,178 +1,97 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* -****************************************************************************** -* -* ptrace05 - an app which ptraces itself as per arbitrarily specified signals, -* over a user specified range. -* -* Copyright (C) 2009, Ngie Cooper -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. +* Copyright (c) Linux Test Project, 2009-2019 +* Copyright (C) 2009, Ngie Cooper +* Copyright (c) 2023 Wei Gao <[email protected]> +*/ + +/*\ +* [Description] * -* You should have received a copy of the GNU General Public License along -* with this program; if not, write to the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +* This test ptraces itself as per arbitrarily specified signals, +* over 0 to SIGRTMAX range. * -****************************************************************************** */ -#include <sys/types.h> -#include <sys/wait.h> -#include <signal.h> -#include <errno.h> -#include <libgen.h> -#include <math.h> #include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <unistd.h> #include <sys/ptrace.h> - -#include "test.h" #include "lapi/signal.h" +#include "tst_test.h" -char *TCID ="ptrace05" ; -int TST_TOTAL =0 ; - -int usage (const char *); - -int usage (const char *argv0) -{ -fprintf (stderr,"usage: %s [start-signum] [end-signum]\n" , argv0); -return 1 ; -} - -int main (int argc,char **argv) +static void run (void ) { - -int end_signum =-1 ; -int signum; -int start_signum =-1 ; +int signum =0 ;int status; -pid_t child; -tst_parse_opts (argc, argv,NULL ,NULL ); - -if (start_signum ==-1 ) { - start_signum =0 ; - } -if (end_signum ==-1 ) { - end_signum =SIGRTMAX ; - } - -for (signum = start_signum; signum <= end_signum; signum++) { - +for (signum =0 ; signum <=SIGRTMAX ; signum++) {if (signum >= __SIGRTMIN && signum <SIGRTMIN )continue ; -switch (child =fork ()) { -case -1 : -tst_brkm (TBROK |TERRNO ,NULL ,"fork() failed" ); -case 0 : + child =SAFE_FORK (); -if (ptrace (PTRACE_TRACEME ,0 ,NULL ,NULL ) !=-1 ) { -tst_resm (TINFO ,"[child] Sending kill(.., %d)" , - signum); -if (kill (getpid (), signum) <0 ) { -tst_resm (TINFO |TERRNO , -"[child] kill(.., %d) failed." , - signum); - } +if (child ==0 ) { +TEST (ptrace (PTRACE_TRACEME ,0 ,NULL ,NULL )); +if (TST_RET !=-1 ) { +tst_res (TINFO ,"[child] Sending kill(.., %d)" , + signum); +SAFE_KILL (getpid (), signum); }else { - -/* -* This won't increment the TST_COUNT var. -* properly, but it'll show up as a failure -* nonetheless. -*/ -tst_resm (TFAIL |TERRNO , -"Failed to ptrace(PTRACE_TRACEME, ...) " -"properly" ); - +tst_brk (TFAIL |TERRNO , +"Failed to ptrace(PTRACE_TRACEME, ...) " +"properly" ); } +/* Shouldn't get here if signum == 0. */ exit ((signum ==0 ?0 :2 )); -break ; - -default : + } -waitpid (child, &status,0 ); +SAFE_WAITPID (child, &status,0 ); -switch (signum) { -case 0 : -if (WIFEXITED (status) - &&WEXITSTATUS (status) ==0 ) { -tst_resm (TPASS , -"kill(.., 0) exited " -"with 0, as expected." ); - }else { -tst_resm (TFAIL , -"kill(.., 0) didn't exit " -"with 0." ); - } -break ; -case SIGKILL : -if (WIFSIGNALED (status)) { -/* SIGKILL must be uncatchable. */ -if (WTERMSIG (status) ==SIGKILL ) { -tst_resm (TPASS , -"Killed with SIGKILL, " -"as expected." ); - }else { -tst_resm (TPASS , -"Didn't die with " -"SIGKILL (?!) " ); - } - }else if (WIFEXITED (status)) { -tst_resm (TFAIL , -"Exited unexpectedly instead " -"of dying with SIGKILL." ); - }else if (WIFSTOPPED (status)) { -tst_resm (TFAIL , -"Stopped instead of dying " -"with SIGKILL." ); - } -break ; -/* All other processes should be stopped. */ -default : -if (WIFSTOPPED (status)) { -tst_resm (TPASS ,"Stopped as expected" ); +switch (signum) { +case 0 : +if (WIFEXITED (status) + &&WEXITSTATUS (status) ==0 ) { +tst_res (TPASS , +"kill(.., 0) exited with 0, as expected." ); + }else { +tst_brk (TFAIL |TERRNO , +"kill(.., 0) didn't exit with 0." ); + } +break ; +case SIGKILL : +if (WIFSIGNALED (status)) { +/* SIGKILL must be uncatchable. */ +if (WTERMSIG (status) ==SIGKILL ) { +tst_res (TPASS , +"Killed with SIGKILL, as expected." ); }else { -tst_resm (TFAIL ,"Didn't stop as " -"expected." ); -if (kill (child,0 )) { -tst_resm (TINFO , -"Is still alive!?" ); - }else if (WIFEXITED (status)) { -tst_resm (TINFO , -"Exited normally" ); - }else if (WIFSIGNALED (status)) { -tst_resm (TINFO , -"Was signaled with " -"signum=%d" , -WTERMSIG (status)); - } - +tst_brk (TFAIL |TERRNO , +"Didn't die with SIGKILL (?!) " ); } - -break ; - + }else if (WIFEXITED (status)) { +tst_res (TFAIL |TERRNO , +"Exited unexpectedly instead of dying with SIGKILL." ); + }else if (WIFSTOPPED (status)) { +tst_res (TFAIL |TERRNO , +"Stopped instead of dying with SIGKILL." ); } - +break ; +/* All other processes should be stopped. */ +default : +if (WIFSTOPPED (status)) +tst_res (TPASS ,"Stopped as expected" ); +else +tst_res (TFAIL |TERRNO ,"Didn't stop as expected." ); +break ; } -/* Make sure the child dies a quick and painless death ... */ -kill (child,9 ); +if (signum !=0 && signum !=SIGKILL ) +SAFE_PTRACE (PTRACE_CONT , child,NULL ,NULL ); } - -tst_exit (); - } + +static struct tst_test test = { + .test_all = run, + .forks_child =1 , +};
Signature · 5 lines
2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v3 1/2] ptrace05: Refactor the test using new LTP API
Hi!
testcases/kernel/syscalls/ptrace/ptrace05.c line 27
Quoted 1 line
testcases/kernel/syscalls/ptrace/ptrace05.c +1
-0+for (signum =0 ; signum <=SIGRTMAX ; signum++) {
I would put the code in this for loop into a function so that we save some indentation as:
for (signum = 0; signum <= SIGRTMAX; signum++) {
if (signum >= __SIGRTMIN && signum < SIGRTMIN)
continue;
test_signal(sig);
}Quoted 7 lines
testcases/kernel/syscalls/ptrace/ptrace05.c +1
-4-switch (child =fork ()) { -case -1 : -tst_brkm (TBROK |TERRNO ,NULL ,"fork() failed" ); -case 0 : + child =SAFE_FORK ();
testcases/kernel/syscalls/ptrace/ptrace05.c line 34
Quoted 10 lines
testcases/kernel/syscalls/ptrace/ptrace05.c +2
-8-if (ptrace (PTRACE_TRACEME ,0 ,NULL ,NULL ) !=-1 ) { -tst_resm (TINFO ,"[child] Sending kill(.., %d)" , - signum); -if (kill (getpid (), signum) <0 ) { -tst_resm (TINFO |TERRNO , -"[child] kill(.., %d) failed." , - signum); - } +if (child ==0 ) { +TEST (ptrace (PTRACE_TRACEME ,0 ,NULL ,NULL ));
TST_EXP_PASS()?
I guess it would look like:
if (!child) {
TST_EXP_PASS(ptrace(PTRACE_TRACEME, 0, NULL, NULL);
if (!TST_PASS)
exit(0);
tst_res(...);
SAFE_KILL(getpid(), signum);
} else {
...
}testcases/kernel/syscalls/ptrace/ptrace05.c line 37
Quoted 3 lines
testcases/kernel/syscalls/ptrace/ptrace05.c +3
-0+if (TST_RET !=-1 ) { +tst_res (TINFO ,"[child] Sending kill(.., %d)" , + signum);
Maybe TDEBUG instead of TINFO to avoid overly long output?
And we can use tst_strsig() to print the signal name as well.
Quoted 9 lines
testcases/kernel/syscalls/ptrace/ptrace05.c +1
-7+SAFE_KILL (getpid (), signum); }else { - -/* -* This won't increment the TST_COUNT var. -* properly, but it'll show up as a failure -* nonetheless. -*/ - tst_resm(TFAIL | TERRNO,
testcases/kernel/syscalls/ptrace/ptrace05.c line 46
Quoted 10 lines
testcases/kernel/syscalls/ptrace/ptrace05.c +4
-3-"Failed to ptrace(PTRACE_TRACEME, ...) " - "properly"); - +tst_brk (TFAIL |TERRNO , +"Failed to ptrace(PTRACE_TRACEME, ...) " +"properly" ); } +/* Shouldn't get here if signum == 0. */ exit ((signum ==0 ?0 :2 ));
We do not use the exit value for anything in the new code, so this can be just exit(0).
Quoted 46 lines
testcases/kernel/syscalls/ptrace/ptrace05.c +2
-42-break ; - -default : + } -waitpid (child, &status,0 ); +SAFE_WAITPID (child, &status,0 ); -switch (signum) { -case 0 : -if (WIFEXITED (status) - &&WEXITSTATUS (status) ==0 ) { -tst_resm (TPASS , -"kill(.., 0) exited " -"with 0, as expected." ); - }else { -tst_resm (TFAIL , -"kill(.., 0) didn't exit " -"with 0." ); - } -break ; -case SIGKILL : -if (WIFSIGNALED (status)) { -/* SIGKILL must be uncatchable. */ -if (WTERMSIG (status) ==SIGKILL ) { -tst_resm (TPASS , -"Killed with SIGKILL, " -"as expected." ); - }else { -tst_resm (TPASS , -"Didn't die with " -"SIGKILL (?!) " ); - } - }else if (WIFEXITED (status)) { -tst_resm (TFAIL , -"Exited unexpectedly instead " -"of dying with SIGKILL." ); - }else if (WIFSTOPPED (status)) { -tst_resm (TFAIL , -"Stopped instead of dying " -"with SIGKILL." ); - } -break ; -/* All other processes should be stopped. */ -default : -if (WIFSTOPPED (status)) {
testcases/kernel/syscalls/ptrace/ptrace05.c line 59
Quoted 10 lines
testcases/kernel/syscalls/ptrace/ptrace05.c +9
-1-tst_resm (TPASS ,"Stopped as expected" ); +switch (signum) { +case 0 : +if (WIFEXITED (status) + &&WEXITSTATUS (status) ==0 ) { +tst_res (TPASS , +"kill(.., 0) exited with 0, as expected." ); + }else { +tst_brk (TFAIL |TERRNO , +"kill(.., 0) didn't exit with 0." );
We do have tst_strstatus() so that we can print what was the reason child did exit, please use it this TFAIL message.
Quoted 26 lines
testcases/kernel/syscalls/ptrace/ptrace05.c +10
-15+ } +break ; +case SIGKILL : +if (WIFSIGNALED (status)) { +/* SIGKILL must be uncatchable. */ +if (WTERMSIG (status) ==SIGKILL ) { +tst_res (TPASS , +"Killed with SIGKILL, as expected." ); }else { -tst_resm (TFAIL ,"Didn't stop as " -"expected." ); -if (kill (child,0 )) { -tst_resm (TINFO , -"Is still alive!?" ); - }else if (WIFEXITED (status)) { -tst_resm (TINFO , -"Exited normally" ); - }else if (WIFSIGNALED (status)) { -tst_resm (TINFO , -"Was signaled with " -"signum=%d" , -WTERMSIG (status)); - } - +tst_brk (TFAIL |TERRNO , +"Didn't die with SIGKILL (?!) " );
testcases/kernel/syscalls/ptrace/ptrace05.c line 77
Quoted 10 lines
testcases/kernel/syscalls/ptrace/ptrace05.c +6
-3} - -break ; - + }else if (WIFEXITED (status)) { +tst_res (TFAIL |TERRNO , +"Exited unexpectedly instead of dying with SIGKILL." ); + }else if (WIFSTOPPED (status)) { +tst_res (TFAIL |TERRNO , +"Stopped instead of dying with SIGKILL." );
And here as well, this whole part can be replaced by just:
if (WIFSIGNALED(status) && WTERMSIG(status) == SIGKILL) tst_res(TPASS, "Child killed by SIGKILL"); else tst_res(TFAIL, "Child %s", tst_strstatus(status));
Also notice that we shouldn't print errno in this case, so no TERRNO flag there.
testcases/kernel/syscalls/ptrace/ptrace05.c line 85
Quoted 8 lines
testcases/kernel/syscalls/ptrace/ptrace05.c +7
-1- +break ; +/* All other processes should be stopped. */ +default : +if (WIFSTOPPED (status)) +tst_res (TPASS ,"Stopped as expected" ); +else +tst_res (TFAIL |TERRNO ,"Didn't stop as expected." );
Here as well, make use of the tst_strstatus() please.
Quoted 23 lines
testcases/kernel/syscalls/ptrace/ptrace05.c +8
-5+break ; } -/* Make sure the child dies a quick and painless death ... */ -kill (child,9 ); +if (signum !=0 && signum !=SIGKILL ) +SAFE_PTRACE (PTRACE_CONT , child,NULL ,NULL ); } - -tst_exit (); - } + +static struct tst_test test = { + .test_all = run, + .forks_child =1 , +};Signature · 5 lines
2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Signature · 5 lines
Cyril Hrubis [email protected] -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v3 2/2 ptrace06: Refactor the test using new LTP API
In reply to Wei Gao via ltp--- testcases/kernel/syscalls/ptrace/ptrace06.c | 326 ++++++++++-------- .../kernel/syscalls/ptrace/ptrace06_child.c | 16 + 2 files changed, 202 insertions(+), 140 deletions(-) create mode 100644 testcases/kernel/syscalls/ptrace/ptrace06_child.c
testcases/kernel/syscalls/ptrace/ptrace06.c +186 -140
@@ -1,29 +1,28 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* +* Copyright (c) 2008 Analog Devices Inc. +* Copyright (c) Linux Test Project, 2009-2022 +* Copyright (c) 2023 Wei Gao <[email protected]> +*/ + +/*\ +* [Description] +* * check out-of-bound/unaligned addresses given to +* * - {PEEK,POKE}{DATA,TEXT,USER} * - {GET,SET}{,FG}REGS * - {GET,SET}SIGINFO -* -* Copyright (c) 2008 Analog Devices Inc. -* -* Licensed under the GPL-2 or later */ -#define _GNU_SOURCE - -#include <errno.h> -#include <stdbool.h> -#include <stdio.h> #include <stdlib.h> -#include <unistd.h> #include <sys/ptrace.h> - -#include "test.h" -#include "spawn_ptrace_child.h" +#include "tst_test.h" /* this should be sizeof(struct user), but that info is only found * in the kernel asm/user.h which is not exported to userspace. */ +#if defined(__i386__)#define SIZEOF_USER 284#elif defined(__x86_64__)
@@ -32,168 +31,215 @@#define SIZEOF_USER 0x1000/* just pick a big number */ #endif -char *TCID ="ptrace06" ; - -struct test_case_t { +static struct test_case_t {int request;long addr;long data; } test_cases[] = { - { -PTRACE_PEEKDATA ,.addr =0 }, { -PTRACE_PEEKDATA ,.addr =1 }, { -PTRACE_PEEKDATA ,.addr =2 }, { -PTRACE_PEEKDATA ,.addr =3 }, { -PTRACE_PEEKDATA ,.addr =-1 }, { -PTRACE_PEEKDATA ,.addr =-2 }, { -PTRACE_PEEKDATA ,.addr =-3 }, { -PTRACE_PEEKDATA ,.addr =-4 }, { -PTRACE_PEEKTEXT ,.addr =0 }, { -PTRACE_PEEKTEXT ,.addr =1 }, { -PTRACE_PEEKTEXT ,.addr =2 }, { -PTRACE_PEEKTEXT ,.addr =3 }, { -PTRACE_PEEKTEXT ,.addr =-1 }, { -PTRACE_PEEKTEXT ,.addr =-2 }, { -PTRACE_PEEKTEXT ,.addr =-3 }, { -PTRACE_PEEKTEXT ,.addr =-4 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +1 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +2 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +3 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +4 }, { -PTRACE_PEEKUSER ,.addr =-1 }, { -PTRACE_PEEKUSER ,.addr =-2 }, { -PTRACE_PEEKUSER ,.addr =-3 }, { -PTRACE_PEEKUSER ,.addr =-4 }, { -PTRACE_POKEDATA ,.addr =0 }, { -PTRACE_POKEDATA ,.addr =1 }, { -PTRACE_POKEDATA ,.addr =2 }, { -PTRACE_POKEDATA ,.addr =3 }, { -PTRACE_POKEDATA ,.addr =-1 }, { -PTRACE_POKEDATA ,.addr =-2 }, { -PTRACE_POKEDATA ,.addr =-3 }, { -PTRACE_POKEDATA ,.addr =-4 }, { -PTRACE_POKETEXT ,.addr =0 }, { -PTRACE_POKETEXT ,.addr =1 }, { -PTRACE_POKETEXT ,.addr =2 }, { -PTRACE_POKETEXT ,.addr =3 }, { -PTRACE_POKETEXT ,.addr =-1 }, { -PTRACE_POKETEXT ,.addr =-2 }, { -PTRACE_POKETEXT ,.addr =-3 }, { -PTRACE_POKETEXT ,.addr =-4 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +1 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +2 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +3 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +4 }, { -PTRACE_POKEUSER ,.addr =-1 }, { -PTRACE_POKEUSER ,.addr =-2 }, { -PTRACE_POKEUSER ,.addr =-3 }, { -PTRACE_POKEUSER ,.addr =-4 }, + {PTRACE_PEEKDATA , .addr =0 }, + {PTRACE_PEEKDATA , .addr =1 }, + {PTRACE_PEEKDATA , .addr =2 }, + {PTRACE_PEEKDATA , .addr =3 }, + {PTRACE_PEEKDATA , .addr =-1 }, + {PTRACE_PEEKDATA , .addr =-2 }, + {PTRACE_PEEKDATA , .addr =-3 }, + {PTRACE_PEEKDATA , .addr =-4 }, + {PTRACE_PEEKTEXT , .addr =0 }, + {PTRACE_PEEKTEXT , .addr =1 }, + {PTRACE_PEEKTEXT , .addr =2 }, + {PTRACE_PEEKTEXT , .addr =3 }, + {PTRACE_PEEKTEXT , .addr =-1 }, + {PTRACE_PEEKTEXT , .addr =-2 }, + {PTRACE_PEEKTEXT , .addr =-3 }, + {PTRACE_PEEKTEXT , .addr =-4 }, + {PTRACE_PEEKUSER , .addr =SIZEOF_USER +1 }, + {PTRACE_PEEKUSER , .addr =SIZEOF_USER +2 }, + {PTRACE_PEEKUSER , .addr =SIZEOF_USER +3 }, + {PTRACE_PEEKUSER , .addr =SIZEOF_USER +4 }, + {PTRACE_PEEKUSER , .addr =-1 }, + {PTRACE_PEEKUSER , .addr =-2 }, + {PTRACE_PEEKUSER , .addr =-3 }, + {PTRACE_PEEKUSER , .addr =-4 }, + {PTRACE_POKEDATA , .addr =0 }, + {PTRACE_POKEDATA , .addr =1 }, + {PTRACE_POKEDATA , .addr =2 }, + {PTRACE_POKEDATA , .addr =3 }, + {PTRACE_POKEDATA , .addr =-1 }, + {PTRACE_POKEDATA , .addr =-2 }, + {PTRACE_POKEDATA , .addr =-3 }, + {PTRACE_POKEDATA , .addr =-4 }, + {PTRACE_POKETEXT , .addr =0 }, + {PTRACE_POKETEXT , .addr =1 }, + {PTRACE_POKETEXT , .addr =2 }, + {PTRACE_POKETEXT , .addr =3 }, + {PTRACE_POKETEXT , .addr =-1 }, + {PTRACE_POKETEXT , .addr =-2 }, + {PTRACE_POKETEXT , .addr =-3 }, + {PTRACE_POKETEXT , .addr =-4 }, + {PTRACE_POKEUSER , .addr =SIZEOF_USER +1 }, + {PTRACE_POKEUSER , .addr =SIZEOF_USER +2 }, + {PTRACE_POKEUSER , .addr =SIZEOF_USER +3 }, + {PTRACE_POKEUSER , .addr =SIZEOF_USER +4 }, + {PTRACE_POKEUSER , .addr =-1 }, + {PTRACE_POKEUSER , .addr =-2 }, + {PTRACE_POKEUSER , .addr =-3 }, + {PTRACE_POKEUSER , .addr =-4 }, #ifdef PTRACE_GETREGS - { -PTRACE_GETREGS ,.data =0 }, { -PTRACE_GETREGS ,.data =1 }, { -PTRACE_GETREGS ,.data =2 }, { -PTRACE_GETREGS ,.data =3 }, { -PTRACE_GETREGS ,.data =-1 }, { -PTRACE_GETREGS ,.data =-2 }, { -PTRACE_GETREGS ,.data =-3 }, { -PTRACE_GETREGS ,.data =-4 }, + {PTRACE_GETREGS , .data =0 }, + {PTRACE_GETREGS , .data =1 }, + {PTRACE_GETREGS , .data =2 }, + {PTRACE_GETREGS , .data =3 }, + {PTRACE_GETREGS , .data =-1 }, + {PTRACE_GETREGS , .data =-2 }, + {PTRACE_GETREGS , .data =-3 }, + {PTRACE_GETREGS , .data =-4 }, #endif #ifdef PTRACE_GETFGREGS - { -PTRACE_GETFGREGS ,.data =0 }, { -PTRACE_GETFGREGS ,.data =1 }, { -PTRACE_GETFGREGS ,.data =2 }, { -PTRACE_GETFGREGS ,.data =3 }, { -PTRACE_GETFGREGS ,.data =-1 }, { -PTRACE_GETFGREGS ,.data =-2 }, { -PTRACE_GETFGREGS ,.data =-3 }, { -PTRACE_GETFGREGS ,.data =-4 }, + {PTRACE_GETFGREGS , .data =0 }, + {PTRACE_GETFGREGS , .data =1 }, + {PTRACE_GETFGREGS , .data =2 }, + {PTRACE_GETFGREGS , .data =3 }, + {PTRACE_GETFGREGS , .data =-1 }, + {PTRACE_GETFGREGS , .data =-2 }, + {PTRACE_GETFGREGS , .data =-3 }, + {PTRACE_GETFGREGS , .data =-4 }, #endif #ifdef PTRACE_SETREGS - { -PTRACE_SETREGS ,.data =0 }, { -PTRACE_SETREGS ,.data =1 }, { -PTRACE_SETREGS ,.data =2 }, { -PTRACE_SETREGS ,.data =3 }, { -PTRACE_SETREGS ,.data =-1 }, { -PTRACE_SETREGS ,.data =-2 }, { -PTRACE_SETREGS ,.data =-3 }, { -PTRACE_SETREGS ,.data =-4 }, + {PTRACE_SETREGS , .data =0 }, + {PTRACE_SETREGS , .data =1 }, + {PTRACE_SETREGS , .data =2 }, + {PTRACE_SETREGS , .data =3 }, + {PTRACE_SETREGS , .data =-1 }, + {PTRACE_SETREGS , .data =-2 }, + {PTRACE_SETREGS , .data =-3 }, + {PTRACE_SETREGS , .data =-4 }, #endif #ifdef PTRACE_SETFGREGS - { -PTRACE_SETFGREGS ,.data =0 }, { -PTRACE_SETFGREGS ,.data =1 }, { -PTRACE_SETFGREGS ,.data =2 }, { -PTRACE_SETFGREGS ,.data =3 }, { -PTRACE_SETFGREGS ,.data =-1 }, { -PTRACE_SETFGREGS ,.data =-2 }, { -PTRACE_SETFGREGS ,.data =-3 }, { -PTRACE_SETFGREGS ,.data =-4 }, + {PTRACE_SETFGREGS , .data =0 }, + {PTRACE_SETFGREGS , .data =1 }, + {PTRACE_SETFGREGS , .data =2 }, + {PTRACE_SETFGREGS , .data =3 }, + {PTRACE_SETFGREGS , .data =-1 }, + {PTRACE_SETFGREGS , .data =-2 }, + {PTRACE_SETFGREGS , .data =-3 }, + {PTRACE_SETFGREGS , .data =-4 }, #endif #if HAVE_DECL_PTRACE_GETSIGINFO - { -PTRACE_GETSIGINFO ,.data =0 }, { -PTRACE_GETSIGINFO ,.data =1 }, { -PTRACE_GETSIGINFO ,.data =2 }, { -PTRACE_GETSIGINFO ,.data =3 }, { -PTRACE_GETSIGINFO ,.data =-1 }, { -PTRACE_GETSIGINFO ,.data =-2 }, { -PTRACE_GETSIGINFO ,.data =-3 }, { -PTRACE_GETSIGINFO ,.data =-4 }, + {PTRACE_GETSIGINFO , .data =0 }, + {PTRACE_GETSIGINFO , .data =1 }, + {PTRACE_GETSIGINFO , .data =2 }, + {PTRACE_GETSIGINFO , .data =3 }, + {PTRACE_GETSIGINFO , .data =-1 }, + {PTRACE_GETSIGINFO , .data =-2 }, + {PTRACE_GETSIGINFO , .data =-3 }, + {PTRACE_GETSIGINFO , .data =-4 }, #endif #if HAVE_DECL_PTRACE_SETSIGINFO - { -PTRACE_SETSIGINFO ,.data =0 }, { -PTRACE_SETSIGINFO ,.data =1 }, { -PTRACE_SETSIGINFO ,.data =2 }, { -PTRACE_SETSIGINFO ,.data =3 }, { -PTRACE_SETSIGINFO ,.data =-1 }, { -PTRACE_SETSIGINFO ,.data =-2 }, { -PTRACE_SETSIGINFO ,.data =-3 }, { -PTRACE_SETSIGINFO ,.data =-4 }, + {PTRACE_SETSIGINFO , .data =0 }, + {PTRACE_SETSIGINFO , .data =1 }, + {PTRACE_SETSIGINFO , .data =2 }, + {PTRACE_SETSIGINFO , .data =3 }, + {PTRACE_SETSIGINFO , .data =-1 }, + {PTRACE_SETSIGINFO , .data =-2 }, + {PTRACE_SETSIGINFO , .data =-3 }, + {PTRACE_SETSIGINFO , .data =-4 }, #endif }; -int TST_TOTAL =ARRAY_SIZE (test_cases); +#define SPT (x)[PTRACE_##x] = #x, +static char *strings[] = { + SPT(TRACEME) + SPT(PEEKTEXT) + SPT(PEEKDATA) + SPT(PEEKUSER) + SPT(POKETEXT) + SPT(POKEDATA) + SPT(POKEUSER) +#ifdef PTRACE_GETREGS + SPT(GETREGS) +#endif +#ifdef PTRACE_SETREGS + SPT(SETREGS) +#endif +#ifdef PTRACE_GETSIGINFO + SPT(GETSIGINFO) +#endif +#ifdef PTRACE_SETSIGINFO + SPT(SETSIGINFO) +#endif +#ifdef PTRACE_GETFGREGS + SPT(GETFGREGS) +#endif +#ifdef PTRACE_SETFGREGS + SPT(SETFGREGS) +#endif + SPT(KILL) +SPT (SINGLESTEP ) +}; + +static inline char *strptrace (int request) +{ +return strings[request]; +} + +static void child (void ) +{ -int main (int argc,char *argv[]) +char path[512 ]; + +SAFE_PTRACE (PTRACE_TRACEME ,0 ,NULL ,NULL ); + +if (tst_get_path ("ptrace06_child" , path,sizeof (path))) +tst_brk (TCONF ,"Couldn't find ptrace06_child in $PATH" ); + +TEST (execl (path,"ptrace06_child" ,"" ,NULL )); +tst_brk (TFAIL |TTERRNO , +"Failed to execute execl01_child" ); +exit (0 ); +} + +static void run (void ) {size_t i; -long ret; -int saved_errno; +int pid; +int status; -tst_parse_opts (argc, argv,NULL ,NULL ); + pid =SAFE_FORK (); -make_a_baby (argc, argv); +if (!pid) +child (); + +SAFE_WAIT (&status); + +if (!WIFSTOPPED (status)) +tst_brk (TBROK ,"child %d was not stopped" , pid);for (i =0 ; i <ARRAY_SIZE (test_cases); ++i) {struct test_case_t *tc = &test_cases[i]; - errno =0 ; - ret = -ptrace (tc->request, pid, (void *)tc->addr, - (void *)tc->data); - saved_errno = errno; -if (ret !=-1 ) -tst_resm (TFAIL , +TEST (ptrace (tc->request, pid, (void *)tc->addr, + (void *)tc->data)); +if (TST_RET !=-1 ) +tst_brk (TFAIL |TERRNO ,"ptrace(%s, ..., %li, %li) returned %li instead of -1" ,strptrace (tc->request), tc->addr, tc->data, - ret); -else if (saved_errno !=EIO && saved_errno !=EFAULT ) -tst_resm (TFAIL , +TST_RET ); +else if (TST_ERR !=EIO &&TST_ERR !=EFAULT ) +tst_brk (TFAIL |TERRNO ,"ptrace(%s, ..., %li, %li) expected errno EIO or EFAULT; actual: %i (%s)" ,strptrace (tc->request), tc->addr, tc->data, - saved_errno,strerror (saved_errno)); +TST_ERR ,strerror (TST_ERR ));else -tst_resm (TPASS , +tst_res (TPASS ,"ptrace(%s, ..., %li, %li) failed as expected" ,strptrace (tc->request), tc->addr, tc->data); } -/* hopefully this worked */ -ptrace (PTRACE_KILL , pid,NULL ,NULL ); +SAFE_PTRACE (PTRACE_CONT , pid,NULL ,NULL ); -tst_exit (); } + +static struct tst_test test = { + .test_all = run, + .forks_child =1 , +};
testcases/kernel/syscalls/ptrace/ptrace06_child.c new file +16 -0
@@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2018 Linux Test Project +* Copyright (C) 2015 Cyril Hrubis [email protected] +*/ + +#define TST_NO_DEFAULT_MAIN +#include "tst_test.h" + +int main (int argc,char *argv[]) +{ + +tst_res (TPASS ,"%s executed" , argv[0 ]); + +return 0 ; +}
Signature · 5 lines
2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v3 2/2] ptrace06: Refactor the test using new LTP API
Hi!
Quoted 301 lines
testcases/kernel/syscalls/ptrace/ptrace06.c +142
-121+/*\ +* [Description] +* * check out-of-bound/unaligned addresses given to +* * - {PEEK,POKE}{DATA,TEXT,USER} * - {GET,SET}{,FG}REGS * - {GET,SET}SIGINFO -* -* Copyright (c) 2008 Analog Devices Inc. -* -* Licensed under the GPL-2 or later */ -#define _GNU_SOURCE - -#include <errno.h> -#include <stdbool.h> -#include <stdio.h> #include <stdlib.h> -#include <unistd.h> #include <sys/ptrace.h> - -#include "test.h" -#include "spawn_ptrace_child.h" +#include "tst_test.h" /* this should be sizeof(struct user), but that info is only found * in the kernel asm/user.h which is not exported to userspace. */ +#if defined(__i386__)#define SIZEOF_USER 284#elif defined(__x86_64__)@@ -32,168 +31,215 @@#define SIZEOF_USER 0x1000/* just pick a big number */ #endif -char *TCID ="ptrace06" ; - -struct test_case_t { +static struct test_case_t {int request;long addr;long data; } test_cases[] = { - { -PTRACE_PEEKDATA ,.addr =0 }, { -PTRACE_PEEKDATA ,.addr =1 }, { -PTRACE_PEEKDATA ,.addr =2 }, { -PTRACE_PEEKDATA ,.addr =3 }, { -PTRACE_PEEKDATA ,.addr =-1 }, { -PTRACE_PEEKDATA ,.addr =-2 }, { -PTRACE_PEEKDATA ,.addr =-3 }, { -PTRACE_PEEKDATA ,.addr =-4 }, { -PTRACE_PEEKTEXT ,.addr =0 }, { -PTRACE_PEEKTEXT ,.addr =1 }, { -PTRACE_PEEKTEXT ,.addr =2 }, { -PTRACE_PEEKTEXT ,.addr =3 }, { -PTRACE_PEEKTEXT ,.addr =-1 }, { -PTRACE_PEEKTEXT ,.addr =-2 }, { -PTRACE_PEEKTEXT ,.addr =-3 }, { -PTRACE_PEEKTEXT ,.addr =-4 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +1 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +2 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +3 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +4 }, { -PTRACE_PEEKUSER ,.addr =-1 }, { -PTRACE_PEEKUSER ,.addr =-2 }, { -PTRACE_PEEKUSER ,.addr =-3 }, { -PTRACE_PEEKUSER ,.addr =-4 }, { -PTRACE_POKEDATA ,.addr =0 }, { -PTRACE_POKEDATA ,.addr =1 }, { -PTRACE_POKEDATA ,.addr =2 }, { -PTRACE_POKEDATA ,.addr =3 }, { -PTRACE_POKEDATA ,.addr =-1 }, { -PTRACE_POKEDATA ,.addr =-2 }, { -PTRACE_POKEDATA ,.addr =-3 }, { -PTRACE_POKEDATA ,.addr =-4 }, { -PTRACE_POKETEXT ,.addr =0 }, { -PTRACE_POKETEXT ,.addr =1 }, { -PTRACE_POKETEXT ,.addr =2 }, { -PTRACE_POKETEXT ,.addr =3 }, { -PTRACE_POKETEXT ,.addr =-1 }, { -PTRACE_POKETEXT ,.addr =-2 }, { -PTRACE_POKETEXT ,.addr =-3 }, { -PTRACE_POKETEXT ,.addr =-4 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +1 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +2 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +3 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +4 }, { -PTRACE_POKEUSER ,.addr =-1 }, { -PTRACE_POKEUSER ,.addr =-2 }, { -PTRACE_POKEUSER ,.addr =-3 }, { -PTRACE_POKEUSER ,.addr =-4 }, + {PTRACE_PEEKDATA , .addr =0 }, + {PTRACE_PEEKDATA , .addr =1 }, + {PTRACE_PEEKDATA , .addr =2 }, + {PTRACE_PEEKDATA , .addr =3 }, + {PTRACE_PEEKDATA , .addr =-1 }, + {PTRACE_PEEKDATA , .addr =-2 }, + {PTRACE_PEEKDATA , .addr =-3 }, + {PTRACE_PEEKDATA , .addr =-4 }, + {PTRACE_PEEKTEXT , .addr =0 }, + {PTRACE_PEEKTEXT , .addr =1 }, + {PTRACE_PEEKTEXT , .addr =2 }, + {PTRACE_PEEKTEXT , .addr =3 }, + {PTRACE_PEEKTEXT , .addr =-1 }, + {PTRACE_PEEKTEXT , .addr =-2 }, + {PTRACE_PEEKTEXT , .addr =-3 }, + {PTRACE_PEEKTEXT , .addr =-4 }, + {PTRACE_PEEKUSER , .addr =SIZEOF_USER +1 }, + {PTRACE_PEEKUSER , .addr =SIZEOF_USER +2 }, + {PTRACE_PEEKUSER , .addr =SIZEOF_USER +3 }, + {PTRACE_PEEKUSER , .addr =SIZEOF_USER +4 }, + {PTRACE_PEEKUSER , .addr =-1 }, + {PTRACE_PEEKUSER , .addr =-2 }, + {PTRACE_PEEKUSER , .addr =-3 }, + {PTRACE_PEEKUSER , .addr =-4 }, + {PTRACE_POKEDATA , .addr =0 }, + {PTRACE_POKEDATA , .addr =1 }, + {PTRACE_POKEDATA , .addr =2 }, + {PTRACE_POKEDATA , .addr =3 }, + {PTRACE_POKEDATA , .addr =-1 }, + {PTRACE_POKEDATA , .addr =-2 }, + {PTRACE_POKEDATA , .addr =-3 }, + {PTRACE_POKEDATA , .addr =-4 }, + {PTRACE_POKETEXT , .addr =0 }, + {PTRACE_POKETEXT , .addr =1 }, + {PTRACE_POKETEXT , .addr =2 }, + {PTRACE_POKETEXT , .addr =3 }, + {PTRACE_POKETEXT , .addr =-1 }, + {PTRACE_POKETEXT , .addr =-2 }, + {PTRACE_POKETEXT , .addr =-3 }, + {PTRACE_POKETEXT , .addr =-4 }, + {PTRACE_POKEUSER , .addr =SIZEOF_USER +1 }, + {PTRACE_POKEUSER , .addr =SIZEOF_USER +2 }, + {PTRACE_POKEUSER , .addr =SIZEOF_USER +3 }, + {PTRACE_POKEUSER , .addr =SIZEOF_USER +4 }, + {PTRACE_POKEUSER , .addr =-1 }, + {PTRACE_POKEUSER , .addr =-2 }, + {PTRACE_POKEUSER , .addr =-3 }, + {PTRACE_POKEUSER , .addr =-4 }, #ifdef PTRACE_GETREGS - { -PTRACE_GETREGS ,.data =0 }, { -PTRACE_GETREGS ,.data =1 }, { -PTRACE_GETREGS ,.data =2 }, { -PTRACE_GETREGS ,.data =3 }, { -PTRACE_GETREGS ,.data =-1 }, { -PTRACE_GETREGS ,.data =-2 }, { -PTRACE_GETREGS ,.data =-3 }, { -PTRACE_GETREGS ,.data =-4 }, + {PTRACE_GETREGS , .data =0 }, + {PTRACE_GETREGS , .data =1 }, + {PTRACE_GETREGS , .data =2 }, + {PTRACE_GETREGS , .data =3 }, + {PTRACE_GETREGS , .data =-1 }, + {PTRACE_GETREGS , .data =-2 }, + {PTRACE_GETREGS , .data =-3 }, + {PTRACE_GETREGS , .data =-4 }, #endif #ifdef PTRACE_GETFGREGS - { -PTRACE_GETFGREGS ,.data =0 }, { -PTRACE_GETFGREGS ,.data =1 }, { -PTRACE_GETFGREGS ,.data =2 }, { -PTRACE_GETFGREGS ,.data =3 }, { -PTRACE_GETFGREGS ,.data =-1 }, { -PTRACE_GETFGREGS ,.data =-2 }, { -PTRACE_GETFGREGS ,.data =-3 }, { -PTRACE_GETFGREGS ,.data =-4 }, + {PTRACE_GETFGREGS , .data =0 }, + {PTRACE_GETFGREGS , .data =1 }, + {PTRACE_GETFGREGS , .data =2 }, + {PTRACE_GETFGREGS , .data =3 }, + {PTRACE_GETFGREGS , .data =-1 }, + {PTRACE_GETFGREGS , .data =-2 }, + {PTRACE_GETFGREGS , .data =-3 }, + {PTRACE_GETFGREGS , .data =-4 }, #endif #ifdef PTRACE_SETREGS - { -PTRACE_SETREGS ,.data =0 }, { -PTRACE_SETREGS ,.data =1 }, { -PTRACE_SETREGS ,.data =2 }, { -PTRACE_SETREGS ,.data =3 }, { -PTRACE_SETREGS ,.data =-1 }, { -PTRACE_SETREGS ,.data =-2 }, { -PTRACE_SETREGS ,.data =-3 }, { -PTRACE_SETREGS ,.data =-4 }, + {PTRACE_SETREGS , .data =0 }, + {PTRACE_SETREGS , .data =1 }, + {PTRACE_SETREGS , .data =2 }, + {PTRACE_SETREGS , .data =3 }, + {PTRACE_SETREGS , .data =-1 }, + {PTRACE_SETREGS , .data =-2 }, + {PTRACE_SETREGS , .data =-3 }, + {PTRACE_SETREGS , .data =-4 }, #endif #ifdef PTRACE_SETFGREGS - { -PTRACE_SETFGREGS ,.data =0 }, { -PTRACE_SETFGREGS ,.data =1 }, { -PTRACE_SETFGREGS ,.data =2 }, { -PTRACE_SETFGREGS ,.data =3 }, { -PTRACE_SETFGREGS ,.data =-1 }, { -PTRACE_SETFGREGS ,.data =-2 }, { -PTRACE_SETFGREGS ,.data =-3 }, { -PTRACE_SETFGREGS ,.data =-4 }, + {PTRACE_SETFGREGS , .data =0 }, + {PTRACE_SETFGREGS , .data =1 }, + {PTRACE_SETFGREGS , .data =2 }, + {PTRACE_SETFGREGS , .data =3 }, + {PTRACE_SETFGREGS , .data =-1 }, + {PTRACE_SETFGREGS , .data =-2 }, + {PTRACE_SETFGREGS , .data =-3 }, + {PTRACE_SETFGREGS , .data =-4 }, #endif #if HAVE_DECL_PTRACE_GETSIGINFO - { -PTRACE_GETSIGINFO ,.data =0 }, { -PTRACE_GETSIGINFO ,.data =1 }, { -PTRACE_GETSIGINFO ,.data =2 }, { -PTRACE_GETSIGINFO ,.data =3 }, { -PTRACE_GETSIGINFO ,.data =-1 }, { -PTRACE_GETSIGINFO ,.data =-2 }, { -PTRACE_GETSIGINFO ,.data =-3 }, { -PTRACE_GETSIGINFO ,.data =-4 }, + {PTRACE_GETSIGINFO , .data =0 }, + {PTRACE_GETSIGINFO , .data =1 }, + {PTRACE_GETSIGINFO , .data =2 }, + {PTRACE_GETSIGINFO , .data =3 }, + {PTRACE_GETSIGINFO , .data =-1 }, + {PTRACE_GETSIGINFO , .data =-2 }, + {PTRACE_GETSIGINFO , .data =-3 }, + {PTRACE_GETSIGINFO , .data =-4 }, #endif #if HAVE_DECL_PTRACE_SETSIGINFO - { -PTRACE_SETSIGINFO ,.data =0 }, { -PTRACE_SETSIGINFO ,.data =1 }, { -PTRACE_SETSIGINFO ,.data =2 }, { -PTRACE_SETSIGINFO ,.data =3 }, { -PTRACE_SETSIGINFO ,.data =-1 }, { -PTRACE_SETSIGINFO ,.data =-2 }, { -PTRACE_SETSIGINFO ,.data =-3 }, { -PTRACE_SETSIGINFO ,.data =-4 }, + {PTRACE_SETSIGINFO , .data =0 }, + {PTRACE_SETSIGINFO , .data =1 }, + {PTRACE_SETSIGINFO , .data =2 }, + {PTRACE_SETSIGINFO , .data =3 }, + {PTRACE_SETSIGINFO , .data =-1 }, + {PTRACE_SETSIGINFO , .data =-2 }, + {PTRACE_SETSIGINFO , .data =-3 }, + {PTRACE_SETSIGINFO , .data =-4 }, #endif }; -int TST_TOTAL =ARRAY_SIZE (test_cases); +#define SPT (x)[PTRACE_##x] = #x, +static char *strings[] = { + SPT(TRACEME) + SPT(PEEKTEXT) + SPT(PEEKDATA) + SPT(PEEKUSER) + SPT(POKETEXT) + SPT(POKEDATA) + SPT(POKEUSER) +#ifdef PTRACE_GETREGS + SPT(GETREGS) +#endif +#ifdef PTRACE_SETREGS + SPT(SETREGS) +#endif +#ifdef PTRACE_GETSIGINFO + SPT(GETSIGINFO) +#endif +#ifdef PTRACE_SETSIGINFO + SPT(SETSIGINFO) +#endif +#ifdef PTRACE_GETFGREGS + SPT(GETFGREGS) +#endif +#ifdef PTRACE_SETFGREGS + SPT(SETFGREGS) +#endif + SPT(KILL) +SPT (SINGLESTEP ) +}; + +static inline char *strptrace (int request) +{ +return strings[request]; +} + +static void child (void ) +{ -int main (int argc,char *argv[]) +char path[512 ];
testcases/kernel/syscalls/ptrace/ptrace06.c line 198
Quoted 10 lines
testcases/kernel/syscalls/ptrace/ptrace06.c +10
-0+ +SAFE_PTRACE (PTRACE_TRACEME ,0 ,NULL ,NULL ); + +if (tst_get_path ("ptrace06_child" , path,sizeof (path))) +tst_brk (TCONF ,"Couldn't find ptrace06_child in $PATH" ); + +TEST (execl (path,"ptrace06_child" ,"" ,NULL )); +tst_brk (TFAIL |TTERRNO , +"Failed to execute execl01_child" ); +exit (0 );
So this whole exec() stuff looks to me like a uCLinux leftover. I suppose that all this can be easily simplified to the SAFE_PTRACE() and something that makes the child run. I suppose raising SIGSTOP signal would suffice.
Quoted 44 lines
testcases/kernel/syscalls/ptrace/ptrace06.c +20
-14+} + +static void run (void ) {size_t i; -long ret; -int saved_errno; +int pid; +int status; -tst_parse_opts (argc, argv,NULL ,NULL ); + pid =SAFE_FORK (); -make_a_baby (argc, argv); +if (!pid) +child (); + +SAFE_WAIT (&status); + +if (!WIFSTOPPED (status)) +tst_brk (TBROK ,"child %d was not stopped" , pid);for (i =0 ; i <ARRAY_SIZE (test_cases); ++i) {struct test_case_t *tc = &test_cases[i]; - errno =0 ; - ret = -ptrace (tc->request, pid, (void *)tc->addr, - (void *)tc->data); - saved_errno = errno; -if (ret !=-1 ) -tst_resm (TFAIL , +TEST (ptrace (tc->request, pid, (void *)tc->addr, + (void *)tc->data)); +if (TST_RET !=-1 ) +tst_brk (TFAIL |TERRNO ,"ptrace(%s, ..., %li, %li) returned %li instead of -1" ,strptrace (tc->request), tc->addr, tc->data, - ret); -else if (saved_errno !=EIO && saved_errno !=EFAULT ) - tst_resm(TFAIL, +TST_RET ); +else if (TST_ERR !=EIO &&TST_ERR !=EFAULT ) + tst_brk(TFAIL | TERRNO,
testcases/kernel/syscalls/ptrace/ptrace06.c line 236
Quoted 10 lines
testcases/kernel/syscalls/ptrace/ptrace06.c +2
-2"ptrace(%s, ..., %li, %li) expected errno EIO or EFAULT; actual: %i (%s)" ,strptrace (tc->request), tc->addr, tc->data, - saved_errno, strerror(saved_errno)); + TST_ERR, strerror(TST_ERR)); else - tst_resm(TPASS, + tst_res(TPASS,"ptrace(%s, ..., %li, %li) failed as expected" , strptrace(tc->request), tc->addr, tc->data); }
This can be just single TST_EXP_FAIL() we now have a variant that can be passed an array of expected errnos.
Quoted 39 lines
testcases/kernel/syscalls/ptrace/ptrace06.c +6
-3-/* hopefully this worked */ -ptrace (PTRACE_KILL , pid,NULL ,NULL ); +SAFE_PTRACE (PTRACE_CONT , pid,NULL ,NULL ); -tst_exit (); } + +static struct tst_test test = { + .test_all = run, + .forks_child =1 , +};testcases/kernel/syscalls/ptrace/ptrace06_child.c new file +16
-0@@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2018 Linux Test Project +* Copyright (C) 2015 Cyril Hrubis [email protected] +*/ + +#define TST_NO_DEFAULT_MAIN +#include "tst_test.h" + +int main (int argc,char *argv[]) +{ + +tst_res (TPASS ,"%s executed" , argv[0 ]); + +return 0 ; +}Signature · 5 lines
2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Signature · 5 lines
Cyril Hrubis [email protected] -- Mailing list info: https://lists.linux.it/listinfo/ltp
v4 cover ptrace: Refactor
In reply to Wei Gao via ltpWei Gao (2):
ptrace05: Refactor the test using new LTP API
ptrace06: Refactor the test using new LTP API
testcases/kernel/syscalls/ptrace/ptrace05.c | 228 +++++------- testcases/kernel/syscalls/ptrace/ptrace06.c | 325 ++++++++++-------- .../kernel/syscalls/ptrace/ptrace06_child.c | 16 + 3 files changed, 272 insertions(+), 297 deletions(-) create mode 100644 testcases/kernel/syscalls/ptrace/ptrace06_child.c
Signature · 5 lines
2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v4 1/2 ptrace05: Refactor the test using new LTP API
--- testcases/kernel/syscalls/ptrace/ptrace05.c | 228 +++++++------------- 1 file changed, 78 insertions(+), 150 deletions(-)
testcases/kernel/syscalls/ptrace/ptrace05.c +78 -150
@@ -1,178 +1,106 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* -****************************************************************************** -* -* ptrace05 - an app which ptraces itself as per arbitrarily specified signals, -* over a user specified range. -* -* Copyright (C) 2009, Ngie Cooper -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. +* Copyright (c) Linux Test Project, 2009-2019 +* Copyright (C) 2009, Ngie Cooper +* Copyright (c) 2023 Wei Gao <[email protected]> +*/ + +/*\ +* [Description] * -* You should have received a copy of the GNU General Public License along -* with this program; if not, write to the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +* This test ptraces itself as per arbitrarily specified signals, +* over 0 to SIGRTMAX range. * -****************************************************************************** */ -#include <sys/types.h> -#include <sys/wait.h> -#include <signal.h> -#include <errno.h> -#include <libgen.h> -#include <math.h> #include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <unistd.h> #include <sys/ptrace.h> - -#include "test.h" #include "lapi/signal.h" +#include "tst_test.h" -char *TCID ="ptrace05" ; -int TST_TOTAL =0 ; +static int expect_stop; -int usage (const char *); - -int usage (const char *argv0) +static void print_dbg_sig (int signum) { -fprintf (stderr,"usage: %s [start-signum] [end-signum]\n" , argv0); -return 1 ; + +char const *strsig =tst_strsig (signum); + +if (strstr (strsig,"???" )) { +tst_res (TDEBUG ,"[child] Sending kill(.., %d)" , + signum); + }else { +tst_res (TDEBUG ,"[child] Sending kill(.., %s)" , + strsig); + } } -int main (int argc,char **argv) +static void test_signal (int signum) { -int end_signum =-1 ; -int signum; -int start_signum =-1 ;int status; -pid_t child; -tst_parse_opts (argc, argv,NULL ,NULL ); + child =SAFE_FORK (); + +if (!child) { +TST_EXP_PASS_SILENT (ptrace (PTRACE_TRACEME ,0 ,NULL ,NULL )); -if (start_signum ==-1 ) { - start_signum =0 ; +print_dbg_sig (signum); +SAFE_KILL (getpid (), signum); +exit (0 ); } -if (end_signum ==-1 ) { - end_signum =SIGRTMAX ; + +SAFE_WAITPID (child, &status,0 ); + +switch (signum) { +case 0 : +if (WIFEXITED (status) + &&WEXITSTATUS (status) ==0 ) { +tst_res (TPASS , +"kill(.., 0) exited with 0, as expected." ); + }else { +tst_res (TFAIL , +"kill(.., 0) exited with unexpected %s." ,tst_strstatus (status)); + } +break ; +case SIGKILL : +if (WIFSIGNALED (status) &&WTERMSIG (status) ==SIGKILL ) +tst_res (TPASS ,"Child killed by SIGKILL" ); +else +tst_res (TFAIL ,"Child %s" ,tst_strstatus (status)); +break ; +/* All other processes should be stopped. */ +default : +if (WIFSTOPPED (status)) +tst_res (TDEBUG ,"Stopped as expected" ); +else { +tst_res (TFAIL ,"Didn't stop as expected. Child %s" ,tst_strstatus (status)); + expect_stop++; + } +break ; } -for (signum = start_signum; signum <= end_signum; signum++) { +if (signum !=0 && signum !=SIGKILL ) +SAFE_PTRACE (PTRACE_CONT , child,NULL ,NULL ); +} + +static void run (void ) +{ +int signum =0 ; +for (signum =0 ; signum <=SIGRTMAX ; signum++) {if (signum >= __SIGRTMIN && signum <SIGRTMIN )continue ; - -switch (child =fork ()) { -case -1 : -tst_brkm (TBROK |TERRNO ,NULL ,"fork() failed" ); -case 0 : - -if (ptrace (PTRACE_TRACEME ,0 ,NULL ,NULL ) !=-1 ) { -tst_resm (TINFO ,"[child] Sending kill(.., %d)" , - signum); -if (kill (getpid (), signum) <0 ) { -tst_resm (TINFO |TERRNO , -"[child] kill(.., %d) failed." , - signum); - } - }else { - -/* -* This won't increment the TST_COUNT var. -* properly, but it'll show up as a failure -* nonetheless. -*/ -tst_resm (TFAIL |TERRNO , -"Failed to ptrace(PTRACE_TRACEME, ...) " -"properly" ); - - } -/* Shouldn't get here if signum == 0. */ -exit ((signum ==0 ?0 :2 )); -break ; - -default : - -waitpid (child, &status,0 ); - -switch (signum) { -case 0 : -if (WIFEXITED (status) - &&WEXITSTATUS (status) ==0 ) { -tst_resm (TPASS , -"kill(.., 0) exited " -"with 0, as expected." ); - }else { -tst_resm (TFAIL , -"kill(.., 0) didn't exit " -"with 0." ); - } -break ; -case SIGKILL : -if (WIFSIGNALED (status)) { -/* SIGKILL must be uncatchable. */ -if (WTERMSIG (status) ==SIGKILL ) { -tst_resm (TPASS , -"Killed with SIGKILL, " -"as expected." ); - }else { -tst_resm (TPASS , -"Didn't die with " -"SIGKILL (?!) " ); - } - }else if (WIFEXITED (status)) { -tst_resm (TFAIL , -"Exited unexpectedly instead " -"of dying with SIGKILL." ); - }else if (WIFSTOPPED (status)) { -tst_resm (TFAIL , -"Stopped instead of dying " -"with SIGKILL." ); - } -break ; -/* All other processes should be stopped. */ -default : -if (WIFSTOPPED (status)) { -tst_resm (TPASS ,"Stopped as expected" ); - }else { -tst_resm (TFAIL ,"Didn't stop as " -"expected." ); -if (kill (child,0 )) { -tst_resm (TINFO , -"Is still alive!?" ); - }else if (WIFEXITED (status)) { -tst_resm (TINFO , -"Exited normally" ); - }else if (WIFSIGNALED (status)) { -tst_resm (TINFO , -"Was signaled with " -"signum=%d" , -WTERMSIG (status)); - } - - } - -break ; - - } - - } -/* Make sure the child dies a quick and painless death ... */ -kill (child,9 ); - +test_signal (signum); } -tst_exit (); - +if (expect_stop ==0 ) +tst_res (TPASS ,"Stopped as expected" ); +else +tst_res (TFAIL ,"Didn't stop as expected, total %d cases failed" , expect_stop); } + +static struct tst_test test = { + .test_all = run, + .forks_child =1 , +};
Signature · 5 lines
2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v4 1/2] ptrace05: Refactor the test using new LTP API
Hi Wei,
Generally LGTM, with few mostly formatting notes below. Thanks!
Quoted 1 line
testcases/kernel/syscalls/ptrace/ptrace05.c +0
-0
...
Quoted 9 lines
+/*\
+ * [Description]
*- * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.+ * This test ptraces itself as per arbitrarily specified signals,
+ * over 0 to SIGRTMAX range.
*
nit: could you please pay a bit of attention to the blank lines like this one? It's also in print_dbg_sig() and test_signal().
Quoted 9 lines
- ****************************************************************************** */
testcases/kernel/syscalls/ptrace/ptrace05.c +1
-4-int usage (const char *); - -int usage (const char *argv0) +static void print_dbg_sig (int signum) { -fprintf (stderr,"usage: %s [start-signum] [end-signum]\n" , argv0);
testcases/kernel/syscalls/ptrace/ptrace05.c line 33
Quoted 10 lines
testcases/kernel/syscalls/ptrace/ptrace05.c +9
-1-return 1 ; + +char const *strsig =tst_strsig (signum); + +if (strstr (strsig,"???" )) { +tst_res (TDEBUG ,"[child] Sending kill(.., %d)" , + signum); + }else { +tst_res (TDEBUG ,"[child] Sending kill(.., %s)" , + strsig);
nit: this could be in a single line (below 80 or 90 chars), thus without {} (readability).
static void print_dbg_sig(int signum)
{
char const *strsig = tst_strsig(signum);
if (strstr(strsig, "???"))
tst_res(TDEBUG, "[child] Sending kill(.., %d)", signum);
else
tst_res(TDEBUG, "[child] Sending kill(.., %s)", strsig);
}Quoted 43 lines
testcases/kernel/syscalls/ptrace/ptrace05.c +24
-10+ } } -int main (int argc,char **argv) +static void test_signal (int signum) { -int end_signum =-1 ; -int signum; -int start_signum =-1 ;int status; -pid_t child; -tst_parse_opts (argc, argv,NULL ,NULL ); + child =SAFE_FORK (); + +if (!child) { +TST_EXP_PASS_SILENT (ptrace (PTRACE_TRACEME ,0 ,NULL ,NULL )); -if (start_signum ==-1 ) { - start_signum =0 ; +print_dbg_sig (signum); +SAFE_KILL (getpid (), signum); +exit (0 ); } -if (end_signum ==-1 ) { - end_signum =SIGRTMAX ; + +SAFE_WAITPID (child, &status,0 ); + +switch (signum) { +case 0 : +if (WIFEXITED (status) + &&WEXITSTATUS (status) ==0 ) { +tst_res (TPASS , +"kill(.., 0) exited with 0, as expected." ); + }else { +tst_res (TFAIL , +"kill(.., 0) exited with unexpected %s." ,tst_strstatus (status)); + } +break ; +case SIGKILL :
testcases/kernel/syscalls/ptrace/ptrace05.c line 76
Quoted 10 lines
testcases/kernel/syscalls/ptrace/ptrace05.c +10
-0+if (WIFSIGNALED (status) &&WTERMSIG (status) ==SIGKILL ) +tst_res (TPASS ,"Child killed by SIGKILL" ); +else +tst_res (TFAIL ,"Child %s" ,tst_strstatus (status)); +break ; +/* All other processes should be stopped. */ +default : +if (WIFSTOPPED (status)) +tst_res (TDEBUG ,"Stopped as expected" ); +else {
nit: if else uses { }, if should use them as well.
https://www.kernel.org/doc/html/latest/process/coding-style.html#placing-braces-and-spaces
This does not apply if only one branch of a conditional statement is a single statement; in the latter case use braces in both branches
Quoted 5 lines
testcases/kernel/syscalls/ptrace/ptrace05.c +4
-0+tst_res (TFAIL ,"Didn't stop as expected. Child %s" ,tst_strstatus (status)); + expect_stop++; + } +break ; }
...
testcases/kernel/syscalls/ptrace/ptrace05.c line 97
Quoted 1 line
testcases/kernel/syscalls/ptrace/ptrace05.c +1
-0+if (expect_stop ==0 )
nit: if (!expect_stop)
testcases/kernel/syscalls/ptrace/ptrace05.c line 101
Quoted 4 lines
testcases/kernel/syscalls/ptrace/ptrace05.c +3
-0+tst_res (TPASS ,"Stopped as expected" ); + else + tst_res(TFAIL, "Didn't stop as expected, total %d cases failed", expect_stop); }
We don't need another TFAIL it just repeats another TFAIL.
IMHO also TPASS should not be needed (we always get TPASS/TFAIL result for signum == 0), but it does not harm.
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v4 2/2 ptrace06: Refactor the test using new LTP API
In reply to Wei Gao via ltp--- testcases/kernel/syscalls/ptrace/ptrace06.c | 325 ++++++++++-------- .../kernel/syscalls/ptrace/ptrace06_child.c | 16 + 2 files changed, 194 insertions(+), 147 deletions(-) create mode 100644 testcases/kernel/syscalls/ptrace/ptrace06_child.c
testcases/kernel/syscalls/ptrace/ptrace06.c +178 -147
@@ -1,29 +1,28 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* +* Copyright (c) 2008 Analog Devices Inc. +* Copyright (c) Linux Test Project, 2009-2022 +* Copyright (c) 2023 Wei Gao <[email protected]> +*/ + +/*\ +* [Description] +* * check out-of-bound/unaligned addresses given to +* * - {PEEK,POKE}{DATA,TEXT,USER} * - {GET,SET}{,FG}REGS * - {GET,SET}SIGINFO -* -* Copyright (c) 2008 Analog Devices Inc. -* -* Licensed under the GPL-2 or later */ -#define _GNU_SOURCE - -#include <errno.h> -#include <stdbool.h> -#include <stdio.h> #include <stdlib.h> -#include <unistd.h> #include <sys/ptrace.h> - -#include "test.h" -#include "spawn_ptrace_child.h" +#include "tst_test.h" /* this should be sizeof(struct user), but that info is only found * in the kernel asm/user.h which is not exported to userspace. */ +#if defined(__i386__)#define SIZEOF_USER 284#elif defined(__x86_64__)
@@ -32,168 +31,200 @@#define SIZEOF_USER 0x1000/* just pick a big number */ #endif -char *TCID ="ptrace06" ; - -struct test_case_t { +static struct test_case_t {int request;long addr;long data; } test_cases[] = { - { -PTRACE_PEEKDATA ,.addr =0 }, { -PTRACE_PEEKDATA ,.addr =1 }, { -PTRACE_PEEKDATA ,.addr =2 }, { -PTRACE_PEEKDATA ,.addr =3 }, { -PTRACE_PEEKDATA ,.addr =-1 }, { -PTRACE_PEEKDATA ,.addr =-2 }, { -PTRACE_PEEKDATA ,.addr =-3 }, { -PTRACE_PEEKDATA ,.addr =-4 }, { -PTRACE_PEEKTEXT ,.addr =0 }, { -PTRACE_PEEKTEXT ,.addr =1 }, { -PTRACE_PEEKTEXT ,.addr =2 }, { -PTRACE_PEEKTEXT ,.addr =3 }, { -PTRACE_PEEKTEXT ,.addr =-1 }, { -PTRACE_PEEKTEXT ,.addr =-2 }, { -PTRACE_PEEKTEXT ,.addr =-3 }, { -PTRACE_PEEKTEXT ,.addr =-4 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +1 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +2 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +3 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +4 }, { -PTRACE_PEEKUSER ,.addr =-1 }, { -PTRACE_PEEKUSER ,.addr =-2 }, { -PTRACE_PEEKUSER ,.addr =-3 }, { -PTRACE_PEEKUSER ,.addr =-4 }, { -PTRACE_POKEDATA ,.addr =0 }, { -PTRACE_POKEDATA ,.addr =1 }, { -PTRACE_POKEDATA ,.addr =2 }, { -PTRACE_POKEDATA ,.addr =3 }, { -PTRACE_POKEDATA ,.addr =-1 }, { -PTRACE_POKEDATA ,.addr =-2 }, { -PTRACE_POKEDATA ,.addr =-3 }, { -PTRACE_POKEDATA ,.addr =-4 }, { -PTRACE_POKETEXT ,.addr =0 }, { -PTRACE_POKETEXT ,.addr =1 }, { -PTRACE_POKETEXT ,.addr =2 }, { -PTRACE_POKETEXT ,.addr =3 }, { -PTRACE_POKETEXT ,.addr =-1 }, { -PTRACE_POKETEXT ,.addr =-2 }, { -PTRACE_POKETEXT ,.addr =-3 }, { -PTRACE_POKETEXT ,.addr =-4 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +1 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +2 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +3 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +4 }, { -PTRACE_POKEUSER ,.addr =-1 }, { -PTRACE_POKEUSER ,.addr =-2 }, { -PTRACE_POKEUSER ,.addr =-3 }, { -PTRACE_POKEUSER ,.addr =-4 }, + {PTRACE_PEEKDATA , .addr =0 }, + {PTRACE_PEEKDATA , .addr =1 }, + {PTRACE_PEEKDATA , .addr =2 }, + {PTRACE_PEEKDATA , .addr =3 }, + {PTRACE_PEEKDATA , .addr =-1 }, + {PTRACE_PEEKDATA , .addr =-2 }, + {PTRACE_PEEKDATA , .addr =-3 }, + {PTRACE_PEEKDATA , .addr =-4 }, + {PTRACE_PEEKTEXT , .addr =0 }, + {PTRACE_PEEKTEXT , .addr =1 }, + {PTRACE_PEEKTEXT , .addr =2 }, + {PTRACE_PEEKTEXT , .addr =3 }, + {PTRACE_PEEKTEXT , .addr =-1 }, + {PTRACE_PEEKTEXT , .addr =-2 }, + {PTRACE_PEEKTEXT , .addr =-3 }, + {PTRACE_PEEKTEXT , .addr =-4 }, + {PTRACE_PEEKUSER , .addr =SIZEOF_USER +1 }, + {PTRACE_PEEKUSER , .addr =SIZEOF_USER +2 }, + {PTRACE_PEEKUSER , .addr =SIZEOF_USER +3 }, + {PTRACE_PEEKUSER , .addr =SIZEOF_USER +4 }, + {PTRACE_PEEKUSER , .addr =-1 }, + {PTRACE_PEEKUSER , .addr =-2 }, + {PTRACE_PEEKUSER , .addr =-3 }, + {PTRACE_PEEKUSER , .addr =-4 }, + {PTRACE_POKEDATA , .addr =0 }, + {PTRACE_POKEDATA , .addr =1 }, + {PTRACE_POKEDATA , .addr =2 }, + {PTRACE_POKEDATA , .addr =3 }, + {PTRACE_POKEDATA , .addr =-1 }, + {PTRACE_POKEDATA , .addr =-2 }, + {PTRACE_POKEDATA , .addr =-3 }, + {PTRACE_POKEDATA , .addr =-4 }, + {PTRACE_POKETEXT , .addr =0 }, + {PTRACE_POKETEXT , .addr =1 }, + {PTRACE_POKETEXT , .addr =2 }, + {PTRACE_POKETEXT , .addr =3 }, + {PTRACE_POKETEXT , .addr =-1 }, + {PTRACE_POKETEXT , .addr =-2 }, + {PTRACE_POKETEXT , .addr =-3 }, + {PTRACE_POKETEXT , .addr =-4 }, + {PTRACE_POKEUSER , .addr =SIZEOF_USER +1 }, + {PTRACE_POKEUSER , .addr =SIZEOF_USER +2 }, + {PTRACE_POKEUSER , .addr =SIZEOF_USER +3 }, + {PTRACE_POKEUSER , .addr =SIZEOF_USER +4 }, + {PTRACE_POKEUSER , .addr =-1 }, + {PTRACE_POKEUSER , .addr =-2 }, + {PTRACE_POKEUSER , .addr =-3 }, + {PTRACE_POKEUSER , .addr =-4 }, #ifdef PTRACE_GETREGS - { -PTRACE_GETREGS ,.data =0 }, { -PTRACE_GETREGS ,.data =1 }, { -PTRACE_GETREGS ,.data =2 }, { -PTRACE_GETREGS ,.data =3 }, { -PTRACE_GETREGS ,.data =-1 }, { -PTRACE_GETREGS ,.data =-2 }, { -PTRACE_GETREGS ,.data =-3 }, { -PTRACE_GETREGS ,.data =-4 }, + {PTRACE_GETREGS , .data =0 }, + {PTRACE_GETREGS , .data =1 }, + {PTRACE_GETREGS , .data =2 }, + {PTRACE_GETREGS , .data =3 }, + {PTRACE_GETREGS , .data =-1 }, + {PTRACE_GETREGS , .data =-2 }, + {PTRACE_GETREGS , .data =-3 }, + {PTRACE_GETREGS , .data =-4 }, #endif #ifdef PTRACE_GETFGREGS - { -PTRACE_GETFGREGS ,.data =0 }, { -PTRACE_GETFGREGS ,.data =1 }, { -PTRACE_GETFGREGS ,.data =2 }, { -PTRACE_GETFGREGS ,.data =3 }, { -PTRACE_GETFGREGS ,.data =-1 }, { -PTRACE_GETFGREGS ,.data =-2 }, { -PTRACE_GETFGREGS ,.data =-3 }, { -PTRACE_GETFGREGS ,.data =-4 }, + {PTRACE_GETFGREGS , .data =0 }, + {PTRACE_GETFGREGS , .data =1 }, + {PTRACE_GETFGREGS , .data =2 }, + {PTRACE_GETFGREGS , .data =3 }, + {PTRACE_GETFGREGS , .data =-1 }, + {PTRACE_GETFGREGS , .data =-2 }, + {PTRACE_GETFGREGS , .data =-3 }, + {PTRACE_GETFGREGS , .data =-4 }, #endif #ifdef PTRACE_SETREGS - { -PTRACE_SETREGS ,.data =0 }, { -PTRACE_SETREGS ,.data =1 }, { -PTRACE_SETREGS ,.data =2 }, { -PTRACE_SETREGS ,.data =3 }, { -PTRACE_SETREGS ,.data =-1 }, { -PTRACE_SETREGS ,.data =-2 }, { -PTRACE_SETREGS ,.data =-3 }, { -PTRACE_SETREGS ,.data =-4 }, + {PTRACE_SETREGS , .data =0 }, + {PTRACE_SETREGS , .data =1 }, + {PTRACE_SETREGS , .data =2 }, + {PTRACE_SETREGS , .data =3 }, + {PTRACE_SETREGS , .data =-1 }, + {PTRACE_SETREGS , .data =-2 }, + {PTRACE_SETREGS , .data =-3 }, + {PTRACE_SETREGS , .data =-4 }, #endif #ifdef PTRACE_SETFGREGS - { -PTRACE_SETFGREGS ,.data =0 }, { -PTRACE_SETFGREGS ,.data =1 }, { -PTRACE_SETFGREGS ,.data =2 }, { -PTRACE_SETFGREGS ,.data =3 }, { -PTRACE_SETFGREGS ,.data =-1 }, { -PTRACE_SETFGREGS ,.data =-2 }, { -PTRACE_SETFGREGS ,.data =-3 }, { -PTRACE_SETFGREGS ,.data =-4 }, + {PTRACE_SETFGREGS , .data =0 }, + {PTRACE_SETFGREGS , .data =1 }, + {PTRACE_SETFGREGS , .data =2 }, + {PTRACE_SETFGREGS , .data =3 }, + {PTRACE_SETFGREGS , .data =-1 }, + {PTRACE_SETFGREGS , .data =-2 }, + {PTRACE_SETFGREGS , .data =-3 }, + {PTRACE_SETFGREGS , .data =-4 }, #endif #if HAVE_DECL_PTRACE_GETSIGINFO - { -PTRACE_GETSIGINFO ,.data =0 }, { -PTRACE_GETSIGINFO ,.data =1 }, { -PTRACE_GETSIGINFO ,.data =2 }, { -PTRACE_GETSIGINFO ,.data =3 }, { -PTRACE_GETSIGINFO ,.data =-1 }, { -PTRACE_GETSIGINFO ,.data =-2 }, { -PTRACE_GETSIGINFO ,.data =-3 }, { -PTRACE_GETSIGINFO ,.data =-4 }, + {PTRACE_GETSIGINFO , .data =0 }, + {PTRACE_GETSIGINFO , .data =1 }, + {PTRACE_GETSIGINFO , .data =2 }, + {PTRACE_GETSIGINFO , .data =3 }, + {PTRACE_GETSIGINFO , .data =-1 }, + {PTRACE_GETSIGINFO , .data =-2 }, + {PTRACE_GETSIGINFO , .data =-3 }, + {PTRACE_GETSIGINFO , .data =-4 }, #endif #if HAVE_DECL_PTRACE_SETSIGINFO - { -PTRACE_SETSIGINFO ,.data =0 }, { -PTRACE_SETSIGINFO ,.data =1 }, { -PTRACE_SETSIGINFO ,.data =2 }, { -PTRACE_SETSIGINFO ,.data =3 }, { -PTRACE_SETSIGINFO ,.data =-1 }, { -PTRACE_SETSIGINFO ,.data =-2 }, { -PTRACE_SETSIGINFO ,.data =-3 }, { -PTRACE_SETSIGINFO ,.data =-4 }, + {PTRACE_SETSIGINFO , .data =0 }, + {PTRACE_SETSIGINFO , .data =1 }, + {PTRACE_SETSIGINFO , .data =2 }, + {PTRACE_SETSIGINFO , .data =3 }, + {PTRACE_SETSIGINFO , .data =-1 }, + {PTRACE_SETSIGINFO , .data =-2 }, + {PTRACE_SETSIGINFO , .data =-3 }, + {PTRACE_SETSIGINFO , .data =-4 }, #endif }; -int TST_TOTAL =ARRAY_SIZE (test_cases); +#define SPT (x)[PTRACE_##x] = #x, +static char *strings[] = { + SPT(TRACEME) + SPT(PEEKTEXT) + SPT(PEEKDATA) + SPT(PEEKUSER) + SPT(POKETEXT) + SPT(POKEDATA) + SPT(POKEUSER) +#ifdef PTRACE_GETREGS + SPT(GETREGS) +#endif +#ifdef PTRACE_SETREGS + SPT(SETREGS) +#endif +#ifdef PTRACE_GETSIGINFO + SPT(GETSIGINFO) +#endif +#ifdef PTRACE_SETSIGINFO + SPT(SETSIGINFO) +#endif +#ifdef PTRACE_GETFGREGS + SPT(GETFGREGS) +#endif +#ifdef PTRACE_SETFGREGS + SPT(SETFGREGS) +#endif + SPT(KILL) +SPT (SINGLESTEP ) +}; -int main (int argc,char *argv[]) +static inline char *strptrace (int request) +{ +return strings[request]; +} + +static void child (void ) +{ + +char path[512 ]; + +SAFE_PTRACE (PTRACE_TRACEME ,0 ,NULL ,NULL ); +raise (SIGSTOP ); +exit (0 ); +} + +static void run (void ) {size_t i; -long ret; -int saved_errno; +int pid; +int status; +int exp_errnos[] = {EIO ,EFAULT }; -tst_parse_opts (argc, argv,NULL ,NULL ); + pid =SAFE_FORK (); -make_a_baby (argc, argv); +if (!pid) +child (); + +SAFE_WAIT (&status); + +if (!WIFSTOPPED (status)) +tst_brk (TBROK ,"child %d was not stopped" , pid);for (i =0 ; i <ARRAY_SIZE (test_cases); ++i) {struct test_case_t *tc = &test_cases[i]; - errno =0 ; - ret = -ptrace (tc->request, pid, (void *)tc->addr, - (void *)tc->data); - saved_errno = errno; -if (ret !=-1 ) -tst_resm (TFAIL , -"ptrace(%s, ..., %li, %li) returned %li instead of -1" , -strptrace (tc->request), tc->addr, tc->data, - ret); -else if (saved_errno !=EIO && saved_errno !=EFAULT ) -tst_resm (TFAIL , -"ptrace(%s, ..., %li, %li) expected errno EIO or EFAULT; actual: %i (%s)" , -strptrace (tc->request), tc->addr, tc->data, - saved_errno,strerror (saved_errno)); -else -tst_resm (TPASS , -"ptrace(%s, ..., %li, %li) failed as expected" , -strptrace (tc->request), tc->addr, tc->data); +TEST (ptrace (tc->request, pid, (void *)tc->addr, + (void *)tc->data)); +TST_EXP_FAIL_ARR (ptrace (tc->request, pid, (void *)tc->addr, + (void *)tc->data), exp_errnos,ARRAY_SIZE (exp_errnos), +"ptrace(%s, ..., %li, %li) failed as expected" , +strptrace (tc->request), tc->addr, tc->data); } -/* hopefully this worked */ -ptrace (PTRACE_KILL , pid,NULL ,NULL ); +SAFE_PTRACE (PTRACE_CONT , pid,NULL ,NULL ); -tst_exit (); } + +static struct tst_test test = { + .test_all = run, + .forks_child =1 , +};
testcases/kernel/syscalls/ptrace/ptrace06_child.c new file +16 -0
@@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2018 Linux Test Project +* Copyright (C) 2015 Cyril Hrubis [email protected] +*/ + +#define TST_NO_DEFAULT_MAIN +#include "tst_test.h" + +int main (int argc,char *argv[]) +{ + +tst_res (TPASS ,"%s executed" , argv[0 ]); + +return 0 ; +}
Signature · 5 lines
2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v4 2/2] ptrace06: Refactor the test using new LTP API
Hi Wei,
testcases/kernel/syscalls/ptrace/ptrace06.c line 183
Quoted 4 lines
testcases/kernel/syscalls/ptrace/ptrace06.c +4
-0+static inline char *strptrace (int request) +{ +return strings[request]; +}
Why not just use strings[tc->request] directly?
testcases/kernel/syscalls/ptrace/ptrace06.c line 187
Quoted 4 lines
testcases/kernel/syscalls/ptrace/ptrace06.c +4
-0+ +static void child (void ) +{ +
Blank line.
testcases/kernel/syscalls/ptrace/ptrace06.c line 188
Quoted 1 line
testcases/kernel/syscalls/ptrace/ptrace06.c +1
-0+char path[512 ];
Unused variable (it's always nice to compile test and pay attention to the warnings before sending it to ML).
The rest LGTM.
I suggest to merge with following diff.
Thanks!
Kind regards,
Petr
+++ testcases/kernel/syscalls/ptrace/ptrace06.c @@ -8,7 +8,7 @@
/*\
* [Description]
*
- * check out-of-bound/unaligned addresses given to
+ * Check out-of-bound/unaligned addresses given to *
* - {PEEK,POKE}{DATA,TEXT,USER}
* - {GET,SET}{,FG}REGS
@@ -24,11 +24,11 @@
*/
#if defined(__i386__)
-#define SIZEOF_USER 284
+# define SIZEOF_USER 284
#elif defined(__x86_64__)
-#define SIZEOF_USER 928
+# define SIZEOF_USER 928
#else
-#define SIZEOF_USER 0x1000 /* just pick a big number */
+# define SIZEOF_USER 0x1000 /* just pick a big number */
#endif
static struct test_case_t {
@@ -177,16 +177,8 @@ static char *strings[] = {
SPT(SINGLESTEP)
};
-static inline char *strptrace(int request)
-{
- return strings[request];
-}
-
static void child(void)
{
-
- char path[512];
-
SAFE_PTRACE(PTRACE_TRACEME, 0, NULL, NULL);
raise(SIGSTOP);
exit(0);
@@ -217,7 +209,7 @@ static void run(void)
TST_EXP_FAIL_ARR(ptrace(tc->request, pid, (void *)tc->addr,
(void *)tc->data), exp_errnos, ARRAY_SIZE(exp_errnos), "ptrace(%s, ..., %li, %li) failed as expected",
- strptrace(tc->request), tc->addr, tc->data);
+ strings[tc->request], tc->addr, tc->data);
}
SAFE_PTRACE(PTRACE_CONT, pid, NULL, NULL);
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
v5 cover ptrace: Refactor
In reply to Wei Gao via ltpWei Gao (2):
ptrace05: Refactor the test using new LTP API
ptrace06: Refactor the test using new LTP API
testcases/kernel/syscalls/ptrace/ptrace05.c | 223 ++++-------- testcases/kernel/syscalls/ptrace/ptrace06.c | 325 ++++++++++-------- .../kernel/syscalls/ptrace/ptrace06_child.c | 16 + 3 files changed, 260 insertions(+), 304 deletions(-) create mode 100644 testcases/kernel/syscalls/ptrace/ptrace06_child.c
Signature · 5 lines
2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v5 1/2 ptrace05: Refactor the test using new LTP API
--- testcases/kernel/syscalls/ptrace/ptrace05.c | 223 ++++++-------------- 1 file changed, 70 insertions(+), 153 deletions(-)
testcases/kernel/syscalls/ptrace/ptrace05.c +70 -153
@@ -1,178 +1,95 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* -****************************************************************************** -* -* ptrace05 - an app which ptraces itself as per arbitrarily specified signals, -* over a user specified range. -* -* Copyright (C) 2009, Ngie Cooper -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License along -* with this program; if not, write to the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +* Copyright (c) Linux Test Project, 2009-2019 +* Copyright (C) 2009, Ngie Cooper +* Copyright (c) 2023 Wei Gao <[email protected]> +*/ + +/*\ +* [Description] * -****************************************************************************** +* This test ptraces itself as per arbitrarily specified signals, +* over 0 to SIGRTMAX range. */ -#include <sys/types.h> -#include <sys/wait.h> -#include <signal.h> -#include <errno.h> -#include <libgen.h> -#include <math.h> #include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <unistd.h> #include <sys/ptrace.h> - -#include "test.h" #include "lapi/signal.h" +#include "tst_test.h" -char *TCID ="ptrace05" ; -int TST_TOTAL =0 ; - -int usage (const char *); +static int expect_stop; -int usage (const char *argv0) +static void print_dbg_sig (int signum) { -fprintf (stderr,"usage: %s [start-signum] [end-signum]\n" , argv0); -return 1 ; +char const *strsig =tst_strsig (signum); + +if (strstr (strsig,"???" )) +tst_res (TDEBUG ,"[child] Sending kill(.., %d)" , signum); +else +tst_res (TDEBUG ,"[child] Sending kill(.., %s)" , strsig); } -int main (int argc,char **argv) +static void test_signal (int signum) { - -int end_signum =-1 ; -int signum; -int start_signum =-1 ;int status; -pid_t child; -tst_parse_opts (argc, argv,NULL ,NULL ); + child =SAFE_FORK (); -if (start_signum ==-1 ) { - start_signum =0 ; +if (!child) { +TST_EXP_PASS_SILENT (ptrace (PTRACE_TRACEME ,0 ,NULL ,NULL )); + +print_dbg_sig (signum); +SAFE_KILL (getpid (), signum); +exit (0 ); } -if (end_signum ==-1 ) { - end_signum =SIGRTMAX ; + +SAFE_WAITPID (child, &status,0 ); + +switch (signum) { +case 0 : +if (WIFEXITED (status) + &&WEXITSTATUS (status) ==0 ) { +tst_res (TPASS , +"kill(.., 0) exited with 0, as expected." ); + }else { +tst_res (TFAIL , +"kill(.., 0) exited with unexpected %s." ,tst_strstatus (status)); + } +break ; +case SIGKILL : +if (WIFSIGNALED (status) &&WTERMSIG (status) ==SIGKILL ) +tst_res (TPASS ,"Child killed by SIGKILL" ); +else +tst_res (TFAIL ,"Child %s" ,tst_strstatus (status)); +break ; +/* All other processes should be stopped. */ +default : +if (WIFSTOPPED (status)) { +tst_res (TDEBUG ,"Stopped as expected" ); + }else { +tst_res (TFAIL ,"Didn't stop as expected. Child %s" ,tst_strstatus (status)); + expect_stop++; + } +break ; } -for (signum = start_signum; signum <= end_signum; signum++) { +if (signum !=0 && signum !=SIGKILL ) +SAFE_PTRACE (PTRACE_CONT , child,NULL ,NULL ); +} +static void run (void ) +{ +int signum =0 ; + +for (signum =0 ; signum <=SIGRTMAX ; signum++) {if (signum >= __SIGRTMIN && signum <SIGRTMIN )continue ; - -switch (child =fork ()) { -case -1 : -tst_brkm (TBROK |TERRNO ,NULL ,"fork() failed" ); -case 0 : - -if (ptrace (PTRACE_TRACEME ,0 ,NULL ,NULL ) !=-1 ) { -tst_resm (TINFO ,"[child] Sending kill(.., %d)" , - signum); -if (kill (getpid (), signum) <0 ) { -tst_resm (TINFO |TERRNO , -"[child] kill(.., %d) failed." , - signum); - } - }else { - -/* -* This won't increment the TST_COUNT var. -* properly, but it'll show up as a failure -* nonetheless. -*/ -tst_resm (TFAIL |TERRNO , -"Failed to ptrace(PTRACE_TRACEME, ...) " -"properly" ); - - } -/* Shouldn't get here if signum == 0. */ -exit ((signum ==0 ?0 :2 )); -break ; - -default : - -waitpid (child, &status,0 ); - -switch (signum) { -case 0 : -if (WIFEXITED (status) - &&WEXITSTATUS (status) ==0 ) { -tst_resm (TPASS , -"kill(.., 0) exited " -"with 0, as expected." ); - }else { -tst_resm (TFAIL , -"kill(.., 0) didn't exit " -"with 0." ); - } -break ; -case SIGKILL : -if (WIFSIGNALED (status)) { -/* SIGKILL must be uncatchable. */ -if (WTERMSIG (status) ==SIGKILL ) { -tst_resm (TPASS , -"Killed with SIGKILL, " -"as expected." ); - }else { -tst_resm (TPASS , -"Didn't die with " -"SIGKILL (?!) " ); - } - }else if (WIFEXITED (status)) { -tst_resm (TFAIL , -"Exited unexpectedly instead " -"of dying with SIGKILL." ); - }else if (WIFSTOPPED (status)) { -tst_resm (TFAIL , -"Stopped instead of dying " -"with SIGKILL." ); - } -break ; -/* All other processes should be stopped. */ -default : -if (WIFSTOPPED (status)) { -tst_resm (TPASS ,"Stopped as expected" ); - }else { -tst_resm (TFAIL ,"Didn't stop as " -"expected." ); -if (kill (child,0 )) { -tst_resm (TINFO , -"Is still alive!?" ); - }else if (WIFEXITED (status)) { -tst_resm (TINFO , -"Exited normally" ); - }else if (WIFSIGNALED (status)) { -tst_resm (TINFO , -"Was signaled with " -"signum=%d" , -WTERMSIG (status)); - } - - } - -break ; - - } - - } -/* Make sure the child dies a quick and painless death ... */ -kill (child,9 ); - +test_signal (signum); } - -tst_exit (); - } + +static struct tst_test test = { + .test_all = run, + .forks_child =1 , +};
Signature · 5 lines
2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v5 1/2] ptrace05: Refactor the test using new LTP API
Hi!
Review
Quoted 11 lines
(quoted diff) +7
-2+static void print_dbg_sig(int signum) { - fprintf(stderr, "usage: %s [start-signum] [end-signum]\n", argv0); - return 1; + char const *strsig = tst_strsig(signum); + + if (strstr(strsig, "???")) + tst_res(TDEBUG, "[child] Sending kill(.., %d)", signum); + else + tst_res(TDEBUG, "[child] Sending kill(.., %s)", strsig); }
This works around the library defficiencies. I would rather see patch that changes the tst_strsig() return the number if we do not have a match.
This should work:
lib/tests/tst_strsig.c +1 -0
@@ -29,6 +29,7 @@ int TST_TOTAL = 1;int main (void ) { +fprintf (stderr,"0 = %s\n" ,tst_strsig (0 ));fprintf (stderr,"SIGKILL = %s\n" ,tst_strsig (SIGKILL ));fprintf (stderr,"SIGALRM = %s\n" ,tst_strsig (SIGALRM ));return 0 ;
lib/tst_res.c +8 -6
@@ -141,11 +141,14 @@ struct pair {#define PAIR (def) [def] = {.name = #def, .val = def},#define STRPAIR (key, value) [key] = {.name = value, .val = key}, -#define PAIR_LOOKUP (pair_arr, idx) do { \ - if (idx < 0 || (size_t)idx >= ARRAY_SIZE(pair_arr) || \ - pair_arr[idx].name == NULL) \ - return "???"; \ - return pair_arr[idx].name; \ +#define PAIR_LOOKUP (pair_arr, idx) do { \ + static char par_str_buf__[16]; \ + if (idx < 0 || (size_t)idx >= ARRAY_SIZE(pair_arr) || \ + pair_arr[idx].name == NULL) { \ + snprintf(par_str_buf__, sizeof(par_str_buf__), "%i", idx); \ + return par_str_buf__; \ + } \ + return pair_arr[idx].name; \ } while (0) --
Cyril Hrubis
[email protected]
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Petr Vorel
Reviewed-byRe: [LTP] [PATCH v5 1/2] ptrace05: Refactor the test using new LTP API
Hi Cyril, Wei,
Quoted 16 lines
Hi!
Review
Quoted 11 lines
(quoted diff) +7
-2+static void print_dbg_sig(int signum) { - fprintf(stderr, "usage: %s [start-signum] [end-signum]\n", argv0); - return 1; + char const *strsig = tst_strsig(signum); + + if (strstr(strsig, "???")) + tst_res(TDEBUG, "[child] Sending kill(.., %d)", signum); + else + tst_res(TDEBUG, "[child] Sending kill(.., %s)", strsig); }This works around the library defficiencies. I would rather see patch that changes the
tst_strsig()return the number if we do not have a match.
Good point.
Quoted 26 lines
This should work:
lib/tests/tst_strsig.c +1
-0@@ -29,6 +29,7 @@ int TST_TOTAL = 1;int main (void ) { +fprintf (stderr,"0 = %s\n" ,tst_strsig (0 ));fprintf (stderr,"SIGKILL = %s\n" ,tst_strsig (SIGKILL ));fprintf (stderr,"SIGALRM = %s\n" ,tst_strsig (SIGALRM ));return 0 ;lib/tst_res.c +0
-4@@ -141,11 +141,14 @@ struct pair {#define PAIR (def) [def] = {.name = #def, .val = def},#define STRPAIR (key, value) [key] = {.name = value, .val = key}, -#define PAIR_LOOKUP (pair_arr, idx) do { \ - if (idx < 0 || (size_t)idx >= ARRAY_SIZE(pair_arr) || \ - pair_arr[idx].name == NULL) \ - return "???"; \
lib/tst_res.c struct pair { · line 152
Quoted 10 lines
lib/tst_res.c +8
-1-return pair_arr[idx].name; \ +#define PAIR_LOOKUP (pair_arr, idx) do { \ + static char par_str_buf__[16]; \ + if (idx < 0 || (size_t)idx >= ARRAY_SIZE(pair_arr) || \ + pair_arr[idx].name == NULL) { \ + snprintf(par_str_buf__, sizeof(par_str_buf__), "%i", idx); \ + return par_str_buf__; \ + } \ + return pair_arr[idx].name; \ } while (0)
For this library change:
This makes sense. Could you please for speedup merge this library change, so that Wei can base v6 on it?
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v5 1/2] ptrace05: Refactor the test using new LTP API
Hi!
Quoted 36 lines
Quoted 24 lines
lib/tests/tst_strsig.c +1
-0@@ -29,6 +29,7 @@ int TST_TOTAL = 1;int main (void ) { +fprintf (stderr,"0 = %s\n" ,tst_strsig (0 ));fprintf (stderr,"SIGKILL = %s\n" ,tst_strsig (SIGKILL ));fprintf (stderr,"SIGALRM = %s\n" ,tst_strsig (SIGALRM ));return 0 ;lib/tst_res.c +0
-4@@ -141,11 +141,14 @@ struct pair {#define PAIR (def) [def] = {.name = #def, .val = def},#define STRPAIR (key, value) [key] = {.name = value, .val = key}, -#define PAIR_LOOKUP (pair_arr, idx) do { \ - if (idx < 0 || (size_t)idx >= ARRAY_SIZE(pair_arr) || \ - pair_arr[idx].name == NULL) \ - return "???"; \lib/tst_res.c struct pair { · line 152
Quoted 10 lines
lib/tst_res.c +8
-1-return pair_arr[idx].name; \ +#define PAIR_LOOKUP (pair_arr, idx) do { \ + static char par_str_buf__[16]; \ + if (idx < 0 || (size_t)idx >= ARRAY_SIZE(pair_arr) || \ + pair_arr[idx].name == NULL) { \ + snprintf(par_str_buf__, sizeof(par_str_buf__), "%i", idx); \ + return par_str_buf__; \ + } \ + return pair_arr[idx].name; \ } while (0)For this library change:
Quoted 4 lines
Reviewed-by Petr Vorel <[email protected]>This makes sense. Could you please for speedup merge this library change, so that Wei can base v6 on it?
Pushed, thanks for the review.
Signature · 5 lines
Cyril Hrubis [email protected] -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v5 2/2 ptrace06: Refactor the test using new LTP API
In reply to Wei Gao via ltp--- testcases/kernel/syscalls/ptrace/ptrace06.c | 325 ++++++++++-------- .../kernel/syscalls/ptrace/ptrace06_child.c | 16 + 2 files changed, 190 insertions(+), 151 deletions(-) create mode 100644 testcases/kernel/syscalls/ptrace/ptrace06_child.c
testcases/kernel/syscalls/ptrace/ptrace06.c +174 -151
@@ -1,199 +1,222 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* -* check out-of-bound/unaligned addresses given to +* Copyright (c) 2008 Analog Devices Inc. +* Copyright (c) Linux Test Project, 2009-2022 +* Copyright (c) 2023 Wei Gao <[email protected]> +*/ + +/*\ +* [Description] +* +* Check out-of-bound/unaligned addresses given to +* * - {PEEK,POKE}{DATA,TEXT,USER} * - {GET,SET}{,FG}REGS * - {GET,SET}SIGINFO -* -* Copyright (c) 2008 Analog Devices Inc. -* -* Licensed under the GPL-2 or later */ -#define _GNU_SOURCE - -#include <errno.h> -#include <stdbool.h> -#include <stdio.h> #include <stdlib.h> -#include <unistd.h> #include <sys/ptrace.h> - -#include "test.h" -#include "spawn_ptrace_child.h" +#include "tst_test.h" /* this should be sizeof(struct user), but that info is only found * in the kernel asm/user.h which is not exported to userspace. */ +#if defined(__i386__) -#define SIZEOF_USER 284 +# define SIZEOF_USER 284#elif defined(__x86_64__) -#define SIZEOF_USER 928 +# define SIZEOF_USER 928#else -#define SIZEOF_USER 0x1000/* just pick a big number */ +# define SIZEOF_USER 0x1000/* just pick a big number */ #endif -char *TCID ="ptrace06" ; - -struct test_case_t { +static struct test_case_t {int request;long addr;long data; } test_cases[] = { - { -PTRACE_PEEKDATA ,.addr =0 }, { -PTRACE_PEEKDATA ,.addr =1 }, { -PTRACE_PEEKDATA ,.addr =2 }, { -PTRACE_PEEKDATA ,.addr =3 }, { -PTRACE_PEEKDATA ,.addr =-1 }, { -PTRACE_PEEKDATA ,.addr =-2 }, { -PTRACE_PEEKDATA ,.addr =-3 }, { -PTRACE_PEEKDATA ,.addr =-4 }, { -PTRACE_PEEKTEXT ,.addr =0 }, { -PTRACE_PEEKTEXT ,.addr =1 }, { -PTRACE_PEEKTEXT ,.addr =2 }, { -PTRACE_PEEKTEXT ,.addr =3 }, { -PTRACE_PEEKTEXT ,.addr =-1 }, { -PTRACE_PEEKTEXT ,.addr =-2 }, { -PTRACE_PEEKTEXT ,.addr =-3 }, { -PTRACE_PEEKTEXT ,.addr =-4 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +1 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +2 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +3 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +4 }, { -PTRACE_PEEKUSER ,.addr =-1 }, { -PTRACE_PEEKUSER ,.addr =-2 }, { -PTRACE_PEEKUSER ,.addr =-3 }, { -PTRACE_PEEKUSER ,.addr =-4 }, { -PTRACE_POKEDATA ,.addr =0 }, { -PTRACE_POKEDATA ,.addr =1 }, { -PTRACE_POKEDATA ,.addr =2 }, { -PTRACE_POKEDATA ,.addr =3 }, { -PTRACE_POKEDATA ,.addr =-1 }, { -PTRACE_POKEDATA ,.addr =-2 }, { -PTRACE_POKEDATA ,.addr =-3 }, { -PTRACE_POKEDATA ,.addr =-4 }, { -PTRACE_POKETEXT ,.addr =0 }, { -PTRACE_POKETEXT ,.addr =1 }, { -PTRACE_POKETEXT ,.addr =2 }, { -PTRACE_POKETEXT ,.addr =3 }, { -PTRACE_POKETEXT ,.addr =-1 }, { -PTRACE_POKETEXT ,.addr =-2 }, { -PTRACE_POKETEXT ,.addr =-3 }, { -PTRACE_POKETEXT ,.addr =-4 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +1 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +2 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +3 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +4 }, { -PTRACE_POKEUSER ,.addr =-1 }, { -PTRACE_POKEUSER ,.addr =-2 }, { -PTRACE_POKEUSER ,.addr =-3 }, { -PTRACE_POKEUSER ,.addr =-4 }, + {PTRACE_PEEKDATA , .addr =0 }, + {PTRACE_PEEKDATA , .addr =1 }, + {PTRACE_PEEKDATA , .addr =2 }, + {PTRACE_PEEKDATA , .addr =3 }, + {PTRACE_PEEKDATA , .addr =-1 }, + {PTRACE_PEEKDATA , .addr =-2 }, + {PTRACE_PEEKDATA , .addr =-3 }, + {PTRACE_PEEKDATA , .addr =-4 }, + {PTRACE_PEEKTEXT , .addr =0 }, + {PTRACE_PEEKTEXT , .addr =1 }, + {PTRACE_PEEKTEXT , .addr =2 }, + {PTRACE_PEEKTEXT , .addr =3 }, + {PTRACE_PEEKTEXT , .addr =-1 }, + {PTRACE_PEEKTEXT , .addr =-2 }, + {PTRACE_PEEKTEXT , .addr =-3 }, + {PTRACE_PEEKTEXT , .addr =-4 }, + {PTRACE_PEEKUSER , .addr =SIZEOF_USER +1 }, + {PTRACE_PEEKUSER , .addr =SIZEOF_USER +2 }, + {PTRACE_PEEKUSER , .addr =SIZEOF_USER +3 }, + {PTRACE_PEEKUSER , .addr =SIZEOF_USER +4 }, + {PTRACE_PEEKUSER , .addr =-1 }, + {PTRACE_PEEKUSER , .addr =-2 }, + {PTRACE_PEEKUSER , .addr =-3 }, + {PTRACE_PEEKUSER , .addr =-4 }, + {PTRACE_POKEDATA , .addr =0 }, + {PTRACE_POKEDATA , .addr =1 }, + {PTRACE_POKEDATA , .addr =2 }, + {PTRACE_POKEDATA , .addr =3 }, + {PTRACE_POKEDATA , .addr =-1 }, + {PTRACE_POKEDATA , .addr =-2 }, + {PTRACE_POKEDATA , .addr =-3 }, + {PTRACE_POKEDATA , .addr =-4 }, + {PTRACE_POKETEXT , .addr =0 }, + {PTRACE_POKETEXT , .addr =1 }, + {PTRACE_POKETEXT , .addr =2 }, + {PTRACE_POKETEXT , .addr =3 }, + {PTRACE_POKETEXT , .addr =-1 }, + {PTRACE_POKETEXT , .addr =-2 }, + {PTRACE_POKETEXT , .addr =-3 }, + {PTRACE_POKETEXT , .addr =-4 }, + {PTRACE_POKEUSER , .addr =SIZEOF_USER +1 }, + {PTRACE_POKEUSER , .addr =SIZEOF_USER +2 }, + {PTRACE_POKEUSER , .addr =SIZEOF_USER +3 }, + {PTRACE_POKEUSER , .addr =SIZEOF_USER +4 }, + {PTRACE_POKEUSER , .addr =-1 }, + {PTRACE_POKEUSER , .addr =-2 }, + {PTRACE_POKEUSER , .addr =-3 }, + {PTRACE_POKEUSER , .addr =-4 }, #ifdef PTRACE_GETREGS - { -PTRACE_GETREGS ,.data =0 }, { -PTRACE_GETREGS ,.data =1 }, { -PTRACE_GETREGS ,.data =2 }, { -PTRACE_GETREGS ,.data =3 }, { -PTRACE_GETREGS ,.data =-1 }, { -PTRACE_GETREGS ,.data =-2 }, { -PTRACE_GETREGS ,.data =-3 }, { -PTRACE_GETREGS ,.data =-4 }, + {PTRACE_GETREGS , .data =0 }, + {PTRACE_GETREGS , .data =1 }, + {PTRACE_GETREGS , .data =2 }, + {PTRACE_GETREGS , .data =3 }, + {PTRACE_GETREGS , .data =-1 }, + {PTRACE_GETREGS , .data =-2 }, + {PTRACE_GETREGS , .data =-3 }, + {PTRACE_GETREGS , .data =-4 }, #endif #ifdef PTRACE_GETFGREGS - { -PTRACE_GETFGREGS ,.data =0 }, { -PTRACE_GETFGREGS ,.data =1 }, { -PTRACE_GETFGREGS ,.data =2 }, { -PTRACE_GETFGREGS ,.data =3 }, { -PTRACE_GETFGREGS ,.data =-1 }, { -PTRACE_GETFGREGS ,.data =-2 }, { -PTRACE_GETFGREGS ,.data =-3 }, { -PTRACE_GETFGREGS ,.data =-4 }, + {PTRACE_GETFGREGS , .data =0 }, + {PTRACE_GETFGREGS , .data =1 }, + {PTRACE_GETFGREGS , .data =2 }, + {PTRACE_GETFGREGS , .data =3 }, + {PTRACE_GETFGREGS , .data =-1 }, + {PTRACE_GETFGREGS , .data =-2 }, + {PTRACE_GETFGREGS , .data =-3 }, + {PTRACE_GETFGREGS , .data =-4 }, #endif #ifdef PTRACE_SETREGS - { -PTRACE_SETREGS ,.data =0 }, { -PTRACE_SETREGS ,.data =1 }, { -PTRACE_SETREGS ,.data =2 }, { -PTRACE_SETREGS ,.data =3 }, { -PTRACE_SETREGS ,.data =-1 }, { -PTRACE_SETREGS ,.data =-2 }, { -PTRACE_SETREGS ,.data =-3 }, { -PTRACE_SETREGS ,.data =-4 }, + {PTRACE_SETREGS , .data =0 }, + {PTRACE_SETREGS , .data =1 }, + {PTRACE_SETREGS , .data =2 }, + {PTRACE_SETREGS , .data =3 }, + {PTRACE_SETREGS , .data =-1 }, + {PTRACE_SETREGS , .data =-2 }, + {PTRACE_SETREGS , .data =-3 }, + {PTRACE_SETREGS , .data =-4 }, #endif #ifdef PTRACE_SETFGREGS - { -PTRACE_SETFGREGS ,.data =0 }, { -PTRACE_SETFGREGS ,.data =1 }, { -PTRACE_SETFGREGS ,.data =2 }, { -PTRACE_SETFGREGS ,.data =3 }, { -PTRACE_SETFGREGS ,.data =-1 }, { -PTRACE_SETFGREGS ,.data =-2 }, { -PTRACE_SETFGREGS ,.data =-3 }, { -PTRACE_SETFGREGS ,.data =-4 }, + {PTRACE_SETFGREGS , .data =0 }, + {PTRACE_SETFGREGS , .data =1 }, + {PTRACE_SETFGREGS , .data =2 }, + {PTRACE_SETFGREGS , .data =3 }, + {PTRACE_SETFGREGS , .data =-1 }, + {PTRACE_SETFGREGS , .data =-2 }, + {PTRACE_SETFGREGS , .data =-3 }, + {PTRACE_SETFGREGS , .data =-4 }, #endif #if HAVE_DECL_PTRACE_GETSIGINFO - { -PTRACE_GETSIGINFO ,.data =0 }, { -PTRACE_GETSIGINFO ,.data =1 }, { -PTRACE_GETSIGINFO ,.data =2 }, { -PTRACE_GETSIGINFO ,.data =3 }, { -PTRACE_GETSIGINFO ,.data =-1 }, { -PTRACE_GETSIGINFO ,.data =-2 }, { -PTRACE_GETSIGINFO ,.data =-3 }, { -PTRACE_GETSIGINFO ,.data =-4 }, + {PTRACE_GETSIGINFO , .data =0 }, + {PTRACE_GETSIGINFO , .data =1 }, + {PTRACE_GETSIGINFO , .data =2 }, + {PTRACE_GETSIGINFO , .data =3 }, + {PTRACE_GETSIGINFO , .data =-1 }, + {PTRACE_GETSIGINFO , .data =-2 }, + {PTRACE_GETSIGINFO , .data =-3 }, + {PTRACE_GETSIGINFO , .data =-4 }, #endif #if HAVE_DECL_PTRACE_SETSIGINFO - { -PTRACE_SETSIGINFO ,.data =0 }, { -PTRACE_SETSIGINFO ,.data =1 }, { -PTRACE_SETSIGINFO ,.data =2 }, { -PTRACE_SETSIGINFO ,.data =3 }, { -PTRACE_SETSIGINFO ,.data =-1 }, { -PTRACE_SETSIGINFO ,.data =-2 }, { -PTRACE_SETSIGINFO ,.data =-3 }, { -PTRACE_SETSIGINFO ,.data =-4 }, + {PTRACE_SETSIGINFO , .data =0 }, + {PTRACE_SETSIGINFO , .data =1 }, + {PTRACE_SETSIGINFO , .data =2 }, + {PTRACE_SETSIGINFO , .data =3 }, + {PTRACE_SETSIGINFO , .data =-1 }, + {PTRACE_SETSIGINFO , .data =-2 }, + {PTRACE_SETSIGINFO , .data =-3 }, + {PTRACE_SETSIGINFO , .data =-4 }, +#endif +}; + +#define SPT (x)[PTRACE_##x] = #x, +static char *strings[] = { + SPT(TRACEME) + SPT(PEEKTEXT) + SPT(PEEKDATA) + SPT(PEEKUSER) + SPT(POKETEXT) + SPT(POKEDATA) + SPT(POKEUSER) +#ifdef PTRACE_GETREGS + SPT(GETREGS) +#endif +#ifdef PTRACE_SETREGS + SPT(SETREGS) +#endif +#ifdef PTRACE_GETSIGINFO + SPT(GETSIGINFO) #endif +#ifdef PTRACE_SETSIGINFO + SPT(SETSIGINFO) +#endif +#ifdef PTRACE_GETFGREGS + SPT(GETFGREGS) +#endif +#ifdef PTRACE_SETFGREGS + SPT(SETFGREGS) +#endif + SPT(KILL) +SPT (SINGLESTEP ) }; -int TST_TOTAL =ARRAY_SIZE (test_cases); +static void child (void ) +{ +SAFE_PTRACE (PTRACE_TRACEME ,0 ,NULL ,NULL ); +raise (SIGSTOP ); +exit (0 ); +} -int main (int argc,char *argv[]) +static void run (void ) {size_t i; -long ret; -int saved_errno; +int pid; +int status; +int exp_errnos[] = {EIO ,EFAULT }; + + pid =SAFE_FORK (); -tst_parse_opts (argc, argv,NULL ,NULL ); +if (!pid) +child (); -make_a_baby (argc, argv); +SAFE_WAIT (&status); + +if (!WIFSTOPPED (status)) +tst_brk (TBROK ,"child %d was not stopped" , pid);for (i =0 ; i <ARRAY_SIZE (test_cases); ++i) {struct test_case_t *tc = &test_cases[i]; - errno =0 ; - ret = -ptrace (tc->request, pid, (void *)tc->addr, - (void *)tc->data); - saved_errno = errno; -if (ret !=-1 ) -tst_resm (TFAIL , -"ptrace(%s, ..., %li, %li) returned %li instead of -1" , -strptrace (tc->request), tc->addr, tc->data, - ret); -else if (saved_errno !=EIO && saved_errno !=EFAULT ) -tst_resm (TFAIL , -"ptrace(%s, ..., %li, %li) expected errno EIO or EFAULT; actual: %i (%s)" , -strptrace (tc->request), tc->addr, tc->data, - saved_errno,strerror (saved_errno)); -else -tst_resm (TPASS , -"ptrace(%s, ..., %li, %li) failed as expected" , -strptrace (tc->request), tc->addr, tc->data); +TEST (ptrace (tc->request, pid, (void *)tc->addr, + (void *)tc->data)); +TST_EXP_FAIL_ARR (ptrace (tc->request, pid, (void *)tc->addr, + (void *)tc->data), exp_errnos,ARRAY_SIZE (exp_errnos), +"ptrace(%s, ..., %li, %li) failed as expected" , + strings[tc->request], tc->addr, tc->data); } -/* hopefully this worked */ -ptrace (PTRACE_KILL , pid,NULL ,NULL ); +SAFE_PTRACE (PTRACE_CONT , pid,NULL ,NULL ); -tst_exit (); } + +static struct tst_test test = { + .test_all = run, + .forks_child =1 , +};
testcases/kernel/syscalls/ptrace/ptrace06_child.c new file +16 -0
@@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2018 Linux Test Project +* Copyright (C) 2015 Cyril Hrubis [email protected] +*/ + +#define TST_NO_DEFAULT_MAIN +#include "tst_test.h" + +int main (int argc,char *argv[]) +{ + +tst_res (TPASS ,"%s executed" , argv[0 ]); + +return 0 ; +}
Signature · 5 lines
2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp
v6 cover ptrace: Refactor
In reply to Wei Gao via ltpWei Gao (2):
ptrace05: Refactor the test using new LTP API
ptrace06: Refactor the test using new LTP API
testcases/kernel/syscalls/ptrace/ptrace05.c | 220 ++++-------- testcases/kernel/syscalls/ptrace/ptrace06.c | 325 ++++++++++-------- .../kernel/syscalls/ptrace/ptrace06_child.c | 16 + 3 files changed, 257 insertions(+), 304 deletions(-) create mode 100644 testcases/kernel/syscalls/ptrace/ptrace06_child.c
Signature · 5 lines
2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v6 1/2 ptrace05: Refactor the test using new LTP API
--- testcases/kernel/syscalls/ptrace/ptrace05.c | 220 ++++++-------------- 1 file changed, 67 insertions(+), 153 deletions(-)
testcases/kernel/syscalls/ptrace/ptrace05.c +67 -153
@@ -1,178 +1,92 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* -****************************************************************************** -* -* ptrace05 - an app which ptraces itself as per arbitrarily specified signals, -* over a user specified range. -* -* Copyright (C) 2009, Ngie Cooper -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License along -* with this program; if not, write to the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +* Copyright (c) Linux Test Project, 2009-2019 +* Copyright (C) 2009, Ngie Cooper +* Copyright (c) 2023 Wei Gao <[email protected]> +*/ + +/*\ +* [Description] * -****************************************************************************** +* This test ptraces itself as per arbitrarily specified signals, +* over 0 to SIGRTMAX range. */ -#include <sys/types.h> -#include <sys/wait.h> -#include <signal.h> -#include <errno.h> -#include <libgen.h> -#include <math.h> #include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <unistd.h> #include <sys/ptrace.h> - -#include "test.h" #include "lapi/signal.h" +#include "tst_test.h" -char *TCID ="ptrace05" ; -int TST_TOTAL =0 ; - -int usage (const char *); +static int expect_stop; -int usage (const char *argv0) +static void print_dbg_sig (int signum) { -fprintf (stderr,"usage: %s [start-signum] [end-signum]\n" , argv0); -return 1 ; +char const *strsig =tst_strsig (signum); + +tst_res (TDEBUG ,"[child] Sending kill(.., %s)" , strsig); } -int main (int argc,char **argv) +static void test_signal (int signum) { - -int end_signum =-1 ; -int signum; -int start_signum =-1 ;int status; -pid_t child; -tst_parse_opts (argc, argv,NULL ,NULL ); + child =SAFE_FORK (); -if (start_signum ==-1 ) { - start_signum =0 ; +if (!child) { +TST_EXP_PASS_SILENT (ptrace (PTRACE_TRACEME ,0 ,NULL ,NULL )); + +print_dbg_sig (signum); +SAFE_KILL (getpid (), signum); +exit (0 ); } -if (end_signum ==-1 ) { - end_signum =SIGRTMAX ; + +SAFE_WAITPID (child, &status,0 ); + +switch (signum) { +case 0 : +if (WIFEXITED (status) + &&WEXITSTATUS (status) ==0 ) { +tst_res (TPASS , +"kill(.., 0) exited with 0, as expected." ); + }else { +tst_res (TFAIL , +"kill(.., 0) exited with unexpected %s." ,tst_strstatus (status)); + } +break ; +case SIGKILL : +if (WIFSIGNALED (status) &&WTERMSIG (status) ==SIGKILL ) +tst_res (TPASS ,"Child killed by SIGKILL" ); +else +tst_res (TFAIL ,"Child %s" ,tst_strstatus (status)); +break ; +/* All other processes should be stopped. */ +default : +if (WIFSTOPPED (status)) { +tst_res (TDEBUG ,"Stopped as expected" ); + }else { +tst_res (TFAIL ,"Didn't stop as expected. Child %s" ,tst_strstatus (status)); + expect_stop++; + } +break ; } -for (signum = start_signum; signum <= end_signum; signum++) { +if (signum !=0 && signum !=SIGKILL ) +SAFE_PTRACE (PTRACE_CONT , child,NULL ,NULL ); +} +static void run (void ) +{ +int signum =0 ; + +for (signum =0 ; signum <=SIGRTMAX ; signum++) {if (signum >= __SIGRTMIN && signum <SIGRTMIN )continue ; - -switch (child =fork ()) { -case -1 : -tst_brkm (TBROK |TERRNO ,NULL ,"fork() failed" ); -case 0 : - -if (ptrace (PTRACE_TRACEME ,0 ,NULL ,NULL ) !=-1 ) { -tst_resm (TINFO ,"[child] Sending kill(.., %d)" , - signum); -if (kill (getpid (), signum) <0 ) { -tst_resm (TINFO |TERRNO , -"[child] kill(.., %d) failed." , - signum); - } - }else { - -/* -* This won't increment the TST_COUNT var. -* properly, but it'll show up as a failure -* nonetheless. -*/ -tst_resm (TFAIL |TERRNO , -"Failed to ptrace(PTRACE_TRACEME, ...) " -"properly" ); - - } -/* Shouldn't get here if signum == 0. */ -exit ((signum ==0 ?0 :2 )); -break ; - -default : - -waitpid (child, &status,0 ); - -switch (signum) { -case 0 : -if (WIFEXITED (status) - &&WEXITSTATUS (status) ==0 ) { -tst_resm (TPASS , -"kill(.., 0) exited " -"with 0, as expected." ); - }else { -tst_resm (TFAIL , -"kill(.., 0) didn't exit " -"with 0." ); - } -break ; -case SIGKILL : -if (WIFSIGNALED (status)) { -/* SIGKILL must be uncatchable. */ -if (WTERMSIG (status) ==SIGKILL ) { -tst_resm (TPASS , -"Killed with SIGKILL, " -"as expected." ); - }else { -tst_resm (TPASS , -"Didn't die with " -"SIGKILL (?!) " ); - } - }else if (WIFEXITED (status)) { -tst_resm (TFAIL , -"Exited unexpectedly instead " -"of dying with SIGKILL." ); - }else if (WIFSTOPPED (status)) { -tst_resm (TFAIL , -"Stopped instead of dying " -"with SIGKILL." ); - } -break ; -/* All other processes should be stopped. */ -default : -if (WIFSTOPPED (status)) { -tst_resm (TPASS ,"Stopped as expected" ); - }else { -tst_resm (TFAIL ,"Didn't stop as " -"expected." ); -if (kill (child,0 )) { -tst_resm (TINFO , -"Is still alive!?" ); - }else if (WIFEXITED (status)) { -tst_resm (TINFO , -"Exited normally" ); - }else if (WIFSIGNALED (status)) { -tst_resm (TINFO , -"Was signaled with " -"signum=%d" , -WTERMSIG (status)); - } - - } - -break ; - - } - - } -/* Make sure the child dies a quick and painless death ... */ -kill (child,9 ); - +test_signal (signum); } - -tst_exit (); - } + +static struct tst_test test = { + .test_all = run, + .forks_child =1 , +};
Signature · 5 lines
2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v6 1/2] ptrace05: Refactor the test using new LTP API
Hi!
testcases/kernel/syscalls/ptrace/ptrace05.c line 27
Quoted 9 lines
testcases/kernel/syscalls/ptrace/ptrace05.c +4
-3-int usage (const char *argv0) +static void print_dbg_sig (int signum) { -fprintf (stderr,"usage: %s [start-signum] [end-signum]\n" , argv0); -return 1 ; +char const *strsig =tst_strsig (signum); + +tst_res (TDEBUG ,"[child] Sending kill(.., %s)" , strsig); }
Now there is no reason at all to keep this in a function.
Signature · 5 lines
Cyril Hrubis [email protected] -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v6 2/2 ptrace06: Refactor the test using new LTP API
In reply to Wei Gao via ltp--- testcases/kernel/syscalls/ptrace/ptrace06.c | 325 ++++++++++-------- .../kernel/syscalls/ptrace/ptrace06_child.c | 16 + 2 files changed, 190 insertions(+), 151 deletions(-) create mode 100644 testcases/kernel/syscalls/ptrace/ptrace06_child.c
testcases/kernel/syscalls/ptrace/ptrace06.c +174 -151
@@ -1,199 +1,222 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* -* check out-of-bound/unaligned addresses given to +* Copyright (c) 2008 Analog Devices Inc. +* Copyright (c) Linux Test Project, 2009-2022 +* Copyright (c) 2023 Wei Gao <[email protected]> +*/ + +/*\ +* [Description] +* +* Check out-of-bound/unaligned addresses given to +* * - {PEEK,POKE}{DATA,TEXT,USER} * - {GET,SET}{,FG}REGS * - {GET,SET}SIGINFO -* -* Copyright (c) 2008 Analog Devices Inc. -* -* Licensed under the GPL-2 or later */ -#define _GNU_SOURCE - -#include <errno.h> -#include <stdbool.h> -#include <stdio.h> #include <stdlib.h> -#include <unistd.h> #include <sys/ptrace.h> - -#include "test.h" -#include "spawn_ptrace_child.h" +#include "tst_test.h" /* this should be sizeof(struct user), but that info is only found * in the kernel asm/user.h which is not exported to userspace. */ +#if defined(__i386__) -#define SIZEOF_USER 284 +# define SIZEOF_USER 284#elif defined(__x86_64__) -#define SIZEOF_USER 928 +# define SIZEOF_USER 928#else -#define SIZEOF_USER 0x1000/* just pick a big number */ +# define SIZEOF_USER 0x1000/* just pick a big number */ #endif -char *TCID ="ptrace06" ; - -struct test_case_t { +static struct test_case_t {int request;long addr;long data; } test_cases[] = { - { -PTRACE_PEEKDATA ,.addr =0 }, { -PTRACE_PEEKDATA ,.addr =1 }, { -PTRACE_PEEKDATA ,.addr =2 }, { -PTRACE_PEEKDATA ,.addr =3 }, { -PTRACE_PEEKDATA ,.addr =-1 }, { -PTRACE_PEEKDATA ,.addr =-2 }, { -PTRACE_PEEKDATA ,.addr =-3 }, { -PTRACE_PEEKDATA ,.addr =-4 }, { -PTRACE_PEEKTEXT ,.addr =0 }, { -PTRACE_PEEKTEXT ,.addr =1 }, { -PTRACE_PEEKTEXT ,.addr =2 }, { -PTRACE_PEEKTEXT ,.addr =3 }, { -PTRACE_PEEKTEXT ,.addr =-1 }, { -PTRACE_PEEKTEXT ,.addr =-2 }, { -PTRACE_PEEKTEXT ,.addr =-3 }, { -PTRACE_PEEKTEXT ,.addr =-4 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +1 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +2 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +3 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +4 }, { -PTRACE_PEEKUSER ,.addr =-1 }, { -PTRACE_PEEKUSER ,.addr =-2 }, { -PTRACE_PEEKUSER ,.addr =-3 }, { -PTRACE_PEEKUSER ,.addr =-4 }, { -PTRACE_POKEDATA ,.addr =0 }, { -PTRACE_POKEDATA ,.addr =1 }, { -PTRACE_POKEDATA ,.addr =2 }, { -PTRACE_POKEDATA ,.addr =3 }, { -PTRACE_POKEDATA ,.addr =-1 }, { -PTRACE_POKEDATA ,.addr =-2 }, { -PTRACE_POKEDATA ,.addr =-3 }, { -PTRACE_POKEDATA ,.addr =-4 }, { -PTRACE_POKETEXT ,.addr =0 }, { -PTRACE_POKETEXT ,.addr =1 }, { -PTRACE_POKETEXT ,.addr =2 }, { -PTRACE_POKETEXT ,.addr =3 }, { -PTRACE_POKETEXT ,.addr =-1 }, { -PTRACE_POKETEXT ,.addr =-2 }, { -PTRACE_POKETEXT ,.addr =-3 }, { -PTRACE_POKETEXT ,.addr =-4 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +1 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +2 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +3 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +4 }, { -PTRACE_POKEUSER ,.addr =-1 }, { -PTRACE_POKEUSER ,.addr =-2 }, { -PTRACE_POKEUSER ,.addr =-3 }, { -PTRACE_POKEUSER ,.addr =-4 }, + {PTRACE_PEEKDATA , .addr =0 }, + {PTRACE_PEEKDATA , .addr =1 }, + {PTRACE_PEEKDATA , .addr =2 }, + {PTRACE_PEEKDATA , .addr =3 }, + {PTRACE_PEEKDATA , .addr =-1 }, + {PTRACE_PEEKDATA , .addr =-2 }, + {PTRACE_PEEKDATA , .addr =-3 }, + {PTRACE_PEEKDATA , .addr =-4 }, + {PTRACE_PEEKTEXT , .addr =0 }, + {PTRACE_PEEKTEXT , .addr =1 }, + {PTRACE_PEEKTEXT , .addr =2 }, + {PTRACE_PEEKTEXT , .addr =3 }, + {PTRACE_PEEKTEXT , .addr =-1 }, + {PTRACE_PEEKTEXT , .addr =-2 }, + {PTRACE_PEEKTEXT , .addr =-3 }, + {PTRACE_PEEKTEXT , .addr =-4 }, + {PTRACE_PEEKUSER , .addr =SIZEOF_USER +1 }, + {PTRACE_PEEKUSER , .addr =SIZEOF_USER +2 }, + {PTRACE_PEEKUSER , .addr =SIZEOF_USER +3 }, + {PTRACE_PEEKUSER , .addr =SIZEOF_USER +4 }, + {PTRACE_PEEKUSER , .addr =-1 }, + {PTRACE_PEEKUSER , .addr =-2 }, + {PTRACE_PEEKUSER , .addr =-3 }, + {PTRACE_PEEKUSER , .addr =-4 }, + {PTRACE_POKEDATA , .addr =0 }, + {PTRACE_POKEDATA , .addr =1 }, + {PTRACE_POKEDATA , .addr =2 }, + {PTRACE_POKEDATA , .addr =3 }, + {PTRACE_POKEDATA , .addr =-1 }, + {PTRACE_POKEDATA , .addr =-2 }, + {PTRACE_POKEDATA , .addr =-3 }, + {PTRACE_POKEDATA , .addr =-4 }, + {PTRACE_POKETEXT , .addr =0 }, + {PTRACE_POKETEXT , .addr =1 }, + {PTRACE_POKETEXT , .addr =2 }, + {PTRACE_POKETEXT , .addr =3 }, + {PTRACE_POKETEXT , .addr =-1 }, + {PTRACE_POKETEXT , .addr =-2 }, + {PTRACE_POKETEXT , .addr =-3 }, + {PTRACE_POKETEXT , .addr =-4 }, + {PTRACE_POKEUSER , .addr =SIZEOF_USER +1 }, + {PTRACE_POKEUSER , .addr =SIZEOF_USER +2 }, + {PTRACE_POKEUSER , .addr =SIZEOF_USER +3 }, + {PTRACE_POKEUSER , .addr =SIZEOF_USER +4 }, + {PTRACE_POKEUSER , .addr =-1 }, + {PTRACE_POKEUSER , .addr =-2 }, + {PTRACE_POKEUSER , .addr =-3 }, + {PTRACE_POKEUSER , .addr =-4 }, #ifdef PTRACE_GETREGS - { -PTRACE_GETREGS ,.data =0 }, { -PTRACE_GETREGS ,.data =1 }, { -PTRACE_GETREGS ,.data =2 }, { -PTRACE_GETREGS ,.data =3 }, { -PTRACE_GETREGS ,.data =-1 }, { -PTRACE_GETREGS ,.data =-2 }, { -PTRACE_GETREGS ,.data =-3 }, { -PTRACE_GETREGS ,.data =-4 }, + {PTRACE_GETREGS , .data =0 }, + {PTRACE_GETREGS , .data =1 }, + {PTRACE_GETREGS , .data =2 }, + {PTRACE_GETREGS , .data =3 }, + {PTRACE_GETREGS , .data =-1 }, + {PTRACE_GETREGS , .data =-2 }, + {PTRACE_GETREGS , .data =-3 }, + {PTRACE_GETREGS , .data =-4 }, #endif #ifdef PTRACE_GETFGREGS - { -PTRACE_GETFGREGS ,.data =0 }, { -PTRACE_GETFGREGS ,.data =1 }, { -PTRACE_GETFGREGS ,.data =2 }, { -PTRACE_GETFGREGS ,.data =3 }, { -PTRACE_GETFGREGS ,.data =-1 }, { -PTRACE_GETFGREGS ,.data =-2 }, { -PTRACE_GETFGREGS ,.data =-3 }, { -PTRACE_GETFGREGS ,.data =-4 }, + {PTRACE_GETFGREGS , .data =0 }, + {PTRACE_GETFGREGS , .data =1 }, + {PTRACE_GETFGREGS , .data =2 }, + {PTRACE_GETFGREGS , .data =3 }, + {PTRACE_GETFGREGS , .data =-1 }, + {PTRACE_GETFGREGS , .data =-2 }, + {PTRACE_GETFGREGS , .data =-3 }, + {PTRACE_GETFGREGS , .data =-4 }, #endif #ifdef PTRACE_SETREGS - { -PTRACE_SETREGS ,.data =0 }, { -PTRACE_SETREGS ,.data =1 }, { -PTRACE_SETREGS ,.data =2 }, { -PTRACE_SETREGS ,.data =3 }, { -PTRACE_SETREGS ,.data =-1 }, { -PTRACE_SETREGS ,.data =-2 }, { -PTRACE_SETREGS ,.data =-3 }, { -PTRACE_SETREGS ,.data =-4 }, + {PTRACE_SETREGS , .data =0 }, + {PTRACE_SETREGS , .data =1 }, + {PTRACE_SETREGS , .data =2 }, + {PTRACE_SETREGS , .data =3 }, + {PTRACE_SETREGS , .data =-1 }, + {PTRACE_SETREGS , .data =-2 }, + {PTRACE_SETREGS , .data =-3 }, + {PTRACE_SETREGS , .data =-4 }, #endif #ifdef PTRACE_SETFGREGS - { -PTRACE_SETFGREGS ,.data =0 }, { -PTRACE_SETFGREGS ,.data =1 }, { -PTRACE_SETFGREGS ,.data =2 }, { -PTRACE_SETFGREGS ,.data =3 }, { -PTRACE_SETFGREGS ,.data =-1 }, { -PTRACE_SETFGREGS ,.data =-2 }, { -PTRACE_SETFGREGS ,.data =-3 }, { -PTRACE_SETFGREGS ,.data =-4 }, + {PTRACE_SETFGREGS , .data =0 }, + {PTRACE_SETFGREGS , .data =1 }, + {PTRACE_SETFGREGS , .data =2 }, + {PTRACE_SETFGREGS , .data =3 }, + {PTRACE_SETFGREGS , .data =-1 }, + {PTRACE_SETFGREGS , .data =-2 }, + {PTRACE_SETFGREGS , .data =-3 }, + {PTRACE_SETFGREGS , .data =-4 }, #endif #if HAVE_DECL_PTRACE_GETSIGINFO - { -PTRACE_GETSIGINFO ,.data =0 }, { -PTRACE_GETSIGINFO ,.data =1 }, { -PTRACE_GETSIGINFO ,.data =2 }, { -PTRACE_GETSIGINFO ,.data =3 }, { -PTRACE_GETSIGINFO ,.data =-1 }, { -PTRACE_GETSIGINFO ,.data =-2 }, { -PTRACE_GETSIGINFO ,.data =-3 }, { -PTRACE_GETSIGINFO ,.data =-4 }, + {PTRACE_GETSIGINFO , .data =0 }, + {PTRACE_GETSIGINFO , .data =1 }, + {PTRACE_GETSIGINFO , .data =2 }, + {PTRACE_GETSIGINFO , .data =3 }, + {PTRACE_GETSIGINFO , .data =-1 }, + {PTRACE_GETSIGINFO , .data =-2 }, + {PTRACE_GETSIGINFO , .data =-3 }, + {PTRACE_GETSIGINFO , .data =-4 }, #endif #if HAVE_DECL_PTRACE_SETSIGINFO - { -PTRACE_SETSIGINFO ,.data =0 }, { -PTRACE_SETSIGINFO ,.data =1 }, { -PTRACE_SETSIGINFO ,.data =2 }, { -PTRACE_SETSIGINFO ,.data =3 }, { -PTRACE_SETSIGINFO ,.data =-1 }, { -PTRACE_SETSIGINFO ,.data =-2 }, { -PTRACE_SETSIGINFO ,.data =-3 }, { -PTRACE_SETSIGINFO ,.data =-4 }, + {PTRACE_SETSIGINFO , .data =0 }, + {PTRACE_SETSIGINFO , .data =1 }, + {PTRACE_SETSIGINFO , .data =2 }, + {PTRACE_SETSIGINFO , .data =3 }, + {PTRACE_SETSIGINFO , .data =-1 }, + {PTRACE_SETSIGINFO , .data =-2 }, + {PTRACE_SETSIGINFO , .data =-3 }, + {PTRACE_SETSIGINFO , .data =-4 }, +#endif +}; + +#define SPT (x)[PTRACE_##x] = #x, +static char *strings[] = { + SPT(TRACEME) + SPT(PEEKTEXT) + SPT(PEEKDATA) + SPT(PEEKUSER) + SPT(POKETEXT) + SPT(POKEDATA) + SPT(POKEUSER) +#ifdef PTRACE_GETREGS + SPT(GETREGS) +#endif +#ifdef PTRACE_SETREGS + SPT(SETREGS) +#endif +#ifdef PTRACE_GETSIGINFO + SPT(GETSIGINFO) #endif +#ifdef PTRACE_SETSIGINFO + SPT(SETSIGINFO) +#endif +#ifdef PTRACE_GETFGREGS + SPT(GETFGREGS) +#endif +#ifdef PTRACE_SETFGREGS + SPT(SETFGREGS) +#endif + SPT(KILL) +SPT (SINGLESTEP ) }; -int TST_TOTAL =ARRAY_SIZE (test_cases); +static void child (void ) +{ +SAFE_PTRACE (PTRACE_TRACEME ,0 ,NULL ,NULL ); +raise (SIGSTOP ); +exit (0 ); +} -int main (int argc,char *argv[]) +static void run (void ) {size_t i; -long ret; -int saved_errno; +int pid; +int status; +int exp_errnos[] = {EIO ,EFAULT }; + + pid =SAFE_FORK (); -tst_parse_opts (argc, argv,NULL ,NULL ); +if (!pid) +child (); -make_a_baby (argc, argv); +SAFE_WAIT (&status); + +if (!WIFSTOPPED (status)) +tst_brk (TBROK ,"child %d was not stopped" , pid);for (i =0 ; i <ARRAY_SIZE (test_cases); ++i) {struct test_case_t *tc = &test_cases[i]; - errno =0 ; - ret = -ptrace (tc->request, pid, (void *)tc->addr, - (void *)tc->data); - saved_errno = errno; -if (ret !=-1 ) -tst_resm (TFAIL , -"ptrace(%s, ..., %li, %li) returned %li instead of -1" , -strptrace (tc->request), tc->addr, tc->data, - ret); -else if (saved_errno !=EIO && saved_errno !=EFAULT ) -tst_resm (TFAIL , -"ptrace(%s, ..., %li, %li) expected errno EIO or EFAULT; actual: %i (%s)" , -strptrace (tc->request), tc->addr, tc->data, - saved_errno,strerror (saved_errno)); -else -tst_resm (TPASS , -"ptrace(%s, ..., %li, %li) failed as expected" , -strptrace (tc->request), tc->addr, tc->data); +TEST (ptrace (tc->request, pid, (void *)tc->addr, + (void *)tc->data)); +TST_EXP_FAIL_ARR (ptrace (tc->request, pid, (void *)tc->addr, + (void *)tc->data), exp_errnos,ARRAY_SIZE (exp_errnos), +"ptrace(%s, ..., %li, %li) failed as expected" , + strings[tc->request], tc->addr, tc->data); } -/* hopefully this worked */ -ptrace (PTRACE_KILL , pid,NULL ,NULL ); +SAFE_PTRACE (PTRACE_CONT , pid,NULL ,NULL ); -tst_exit (); } + +static struct tst_test test = { + .test_all = run, + .forks_child =1 , +};
testcases/kernel/syscalls/ptrace/ptrace06_child.c new file +16 -0
@@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2018 Linux Test Project +* Copyright (C) 2015 Cyril Hrubis [email protected] +*/ + +#define TST_NO_DEFAULT_MAIN +#include "tst_test.h" + +int main (int argc,char *argv[]) +{ + +tst_res (TPASS ,"%s executed" , argv[0 ]); + +return 0 ; +}
Signature · 5 lines
2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp
v7 cover ptrace: Refactor
In reply to Wei Gao via ltpWei Gao (2):
ptrace05: Refactor the test using new LTP API
ptrace06: Refactor the test using new LTP API
testcases/kernel/syscalls/ptrace/ptrace05.c | 218 ++++-------- testcases/kernel/syscalls/ptrace/ptrace06.c | 325 ++++++++++-------- .../kernel/syscalls/ptrace/ptrace06_child.c | 16 + 3 files changed, 252 insertions(+), 307 deletions(-) create mode 100644 testcases/kernel/syscalls/ptrace/ptrace06_child.c
Signature · 5 lines
2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v7 1/2 ptrace05: Refactor the test using new LTP API
--- testcases/kernel/syscalls/ptrace/ptrace05.c | 218 ++++++-------------- 1 file changed, 62 insertions(+), 156 deletions(-)
testcases/kernel/syscalls/ptrace/ptrace05.c +62 -156
@@ -1,178 +1,84 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* -****************************************************************************** -* -* ptrace05 - an app which ptraces itself as per arbitrarily specified signals, -* over a user specified range. -* -* Copyright (C) 2009, Ngie Cooper -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License along -* with this program; if not, write to the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +* Copyright (c) Linux Test Project, 2009-2019 +* Copyright (C) 2009, Ngie Cooper +* Copyright (c) 2023 Wei Gao <[email protected]> +*/ + +/*\ +* [Description] * -****************************************************************************** +* This test ptraces itself as per arbitrarily specified signals, +* over 0 to SIGRTMAX range. */ -#include <sys/types.h> -#include <sys/wait.h> -#include <signal.h> -#include <errno.h> -#include <libgen.h> -#include <math.h> #include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <unistd.h> #include <sys/ptrace.h> - -#include "test.h" #include "lapi/signal.h" +#include "tst_test.h" -char *TCID ="ptrace05" ; -int TST_TOTAL =0 ; - -int usage (const char *); +static int expect_stop; -int usage (const char *argv0) +static void test_signal (int signum) { -fprintf (stderr,"usage: %s [start-signum] [end-signum]\n" , argv0); -return 1 ; -} - -int main (int argc,char **argv) -{ - -int end_signum =-1 ; -int signum; -int start_signum =-1 ;int status; -pid_t child; -tst_parse_opts (argc, argv,NULL ,NULL ); + child =SAFE_FORK (); -if (start_signum ==-1 ) { - start_signum =0 ; +if (!child) { +TST_EXP_PASS_SILENT (ptrace (PTRACE_TRACEME ,0 ,NULL ,NULL )); +tst_res (TDEBUG ,"[child] Sending kill(.., %s)" ,tst_strsig (signum)); +SAFE_KILL (getpid (), signum); +exit (0 ); } -if (end_signum ==-1 ) { - end_signum =SIGRTMAX ; + +SAFE_WAITPID (child, &status,0 ); + +switch (signum) { +case 0 : +if (WIFEXITED (status) + &&WEXITSTATUS (status) ==0 ) { +tst_res (TPASS , +"kill(.., 0) exited with 0, as expected." ); + }else { +tst_res (TFAIL , +"kill(.., 0) exited with unexpected %s." ,tst_strstatus (status)); + } +break ; +case SIGKILL : +if (WIFSIGNALED (status) &&WTERMSIG (status) ==SIGKILL ) +tst_res (TPASS ,"Child killed by SIGKILL" ); +else +tst_res (TFAIL ,"Child %s" ,tst_strstatus (status)); +break ; +/* All other processes should be stopped. */ +default : +if (WIFSTOPPED (status)) { +tst_res (TDEBUG ,"Stopped as expected" ); + }else { +tst_res (TFAIL ,"Didn't stop as expected. Child %s" ,tst_strstatus (status)); + expect_stop++; + } +break ; } -for (signum = start_signum; signum <= end_signum; signum++) { +if (signum !=0 && signum !=SIGKILL ) +SAFE_PTRACE (PTRACE_CONT , child,NULL ,NULL ); +} + +static void run (void ) +{ +int signum =0 ; +for (signum =0 ; signum <=SIGRTMAX ; signum++) {if (signum >= __SIGRTMIN && signum <SIGRTMIN )continue ; - -switch (child =fork ()) { -case -1 : -tst_brkm (TBROK |TERRNO ,NULL ,"fork() failed" ); -case 0 : - -if (ptrace (PTRACE_TRACEME ,0 ,NULL ,NULL ) !=-1 ) { -tst_resm (TINFO ,"[child] Sending kill(.., %d)" , - signum); -if (kill (getpid (), signum) <0 ) { -tst_resm (TINFO |TERRNO , -"[child] kill(.., %d) failed." , - signum); - } - }else { - -/* -* This won't increment the TST_COUNT var. -* properly, but it'll show up as a failure -* nonetheless. -*/ -tst_resm (TFAIL |TERRNO , -"Failed to ptrace(PTRACE_TRACEME, ...) " -"properly" ); - - } -/* Shouldn't get here if signum == 0. */ -exit ((signum ==0 ?0 :2 )); -break ; - -default : - -waitpid (child, &status,0 ); - -switch (signum) { -case 0 : -if (WIFEXITED (status) - &&WEXITSTATUS (status) ==0 ) { -tst_resm (TPASS , -"kill(.., 0) exited " -"with 0, as expected." ); - }else { -tst_resm (TFAIL , -"kill(.., 0) didn't exit " -"with 0." ); - } -break ; -case SIGKILL : -if (WIFSIGNALED (status)) { -/* SIGKILL must be uncatchable. */ -if (WTERMSIG (status) ==SIGKILL ) { -tst_resm (TPASS , -"Killed with SIGKILL, " -"as expected." ); - }else { -tst_resm (TPASS , -"Didn't die with " -"SIGKILL (?!) " ); - } - }else if (WIFEXITED (status)) { -tst_resm (TFAIL , -"Exited unexpectedly instead " -"of dying with SIGKILL." ); - }else if (WIFSTOPPED (status)) { -tst_resm (TFAIL , -"Stopped instead of dying " -"with SIGKILL." ); - } -break ; -/* All other processes should be stopped. */ -default : -if (WIFSTOPPED (status)) { -tst_resm (TPASS ,"Stopped as expected" ); - }else { -tst_resm (TFAIL ,"Didn't stop as " -"expected." ); -if (kill (child,0 )) { -tst_resm (TINFO , -"Is still alive!?" ); - }else if (WIFEXITED (status)) { -tst_resm (TINFO , -"Exited normally" ); - }else if (WIFSIGNALED (status)) { -tst_resm (TINFO , -"Was signaled with " -"signum=%d" , -WTERMSIG (status)); - } - - } - -break ; - - } - - } -/* Make sure the child dies a quick and painless death ... */ -kill (child,9 ); - +test_signal (signum); } - -tst_exit (); - } + +static struct tst_test test = { + .test_all = run, + .forks_child =1 , +};
Signature · 5 lines
2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v7 1/2] ptrace05: Refactor the test using new LTP API
Hi!
Signature · 5 lines
Cyril Hrubis [email protected] -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v7 2/2 ptrace06: Refactor the test using new LTP API
In reply to Wei Gao via ltp--- testcases/kernel/syscalls/ptrace/ptrace06.c | 325 ++++++++++-------- .../kernel/syscalls/ptrace/ptrace06_child.c | 16 + 2 files changed, 190 insertions(+), 151 deletions(-) create mode 100644 testcases/kernel/syscalls/ptrace/ptrace06_child.c
testcases/kernel/syscalls/ptrace/ptrace06.c +174 -151
@@ -1,199 +1,222 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* -* check out-of-bound/unaligned addresses given to +* Copyright (c) 2008 Analog Devices Inc. +* Copyright (c) Linux Test Project, 2009-2022 +* Copyright (c) 2023 Wei Gao <[email protected]> +*/ + +/*\ +* [Description] +* +* Check out-of-bound/unaligned addresses given to +* * - {PEEK,POKE}{DATA,TEXT,USER} * - {GET,SET}{,FG}REGS * - {GET,SET}SIGINFO -* -* Copyright (c) 2008 Analog Devices Inc. -* -* Licensed under the GPL-2 or later */ -#define _GNU_SOURCE - -#include <errno.h> -#include <stdbool.h> -#include <stdio.h> #include <stdlib.h> -#include <unistd.h> #include <sys/ptrace.h> - -#include "test.h" -#include "spawn_ptrace_child.h" +#include "tst_test.h" /* this should be sizeof(struct user), but that info is only found * in the kernel asm/user.h which is not exported to userspace. */ +#if defined(__i386__) -#define SIZEOF_USER 284 +# define SIZEOF_USER 284#elif defined(__x86_64__) -#define SIZEOF_USER 928 +# define SIZEOF_USER 928#else -#define SIZEOF_USER 0x1000/* just pick a big number */ +# define SIZEOF_USER 0x1000/* just pick a big number */ #endif -char *TCID ="ptrace06" ; - -struct test_case_t { +static struct test_case_t {int request;long addr;long data; } test_cases[] = { - { -PTRACE_PEEKDATA ,.addr =0 }, { -PTRACE_PEEKDATA ,.addr =1 }, { -PTRACE_PEEKDATA ,.addr =2 }, { -PTRACE_PEEKDATA ,.addr =3 }, { -PTRACE_PEEKDATA ,.addr =-1 }, { -PTRACE_PEEKDATA ,.addr =-2 }, { -PTRACE_PEEKDATA ,.addr =-3 }, { -PTRACE_PEEKDATA ,.addr =-4 }, { -PTRACE_PEEKTEXT ,.addr =0 }, { -PTRACE_PEEKTEXT ,.addr =1 }, { -PTRACE_PEEKTEXT ,.addr =2 }, { -PTRACE_PEEKTEXT ,.addr =3 }, { -PTRACE_PEEKTEXT ,.addr =-1 }, { -PTRACE_PEEKTEXT ,.addr =-2 }, { -PTRACE_PEEKTEXT ,.addr =-3 }, { -PTRACE_PEEKTEXT ,.addr =-4 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +1 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +2 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +3 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +4 }, { -PTRACE_PEEKUSER ,.addr =-1 }, { -PTRACE_PEEKUSER ,.addr =-2 }, { -PTRACE_PEEKUSER ,.addr =-3 }, { -PTRACE_PEEKUSER ,.addr =-4 }, { -PTRACE_POKEDATA ,.addr =0 }, { -PTRACE_POKEDATA ,.addr =1 }, { -PTRACE_POKEDATA ,.addr =2 }, { -PTRACE_POKEDATA ,.addr =3 }, { -PTRACE_POKEDATA ,.addr =-1 }, { -PTRACE_POKEDATA ,.addr =-2 }, { -PTRACE_POKEDATA ,.addr =-3 }, { -PTRACE_POKEDATA ,.addr =-4 }, { -PTRACE_POKETEXT ,.addr =0 }, { -PTRACE_POKETEXT ,.addr =1 }, { -PTRACE_POKETEXT ,.addr =2 }, { -PTRACE_POKETEXT ,.addr =3 }, { -PTRACE_POKETEXT ,.addr =-1 }, { -PTRACE_POKETEXT ,.addr =-2 }, { -PTRACE_POKETEXT ,.addr =-3 }, { -PTRACE_POKETEXT ,.addr =-4 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +1 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +2 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +3 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +4 }, { -PTRACE_POKEUSER ,.addr =-1 }, { -PTRACE_POKEUSER ,.addr =-2 }, { -PTRACE_POKEUSER ,.addr =-3 }, { -PTRACE_POKEUSER ,.addr =-4 }, + {PTRACE_PEEKDATA , .addr =0 }, + {PTRACE_PEEKDATA , .addr =1 }, + {PTRACE_PEEKDATA , .addr =2 }, + {PTRACE_PEEKDATA , .addr =3 }, + {PTRACE_PEEKDATA , .addr =-1 }, + {PTRACE_PEEKDATA , .addr =-2 }, + {PTRACE_PEEKDATA , .addr =-3 }, + {PTRACE_PEEKDATA , .addr =-4 }, + {PTRACE_PEEKTEXT , .addr =0 }, + {PTRACE_PEEKTEXT , .addr =1 }, + {PTRACE_PEEKTEXT , .addr =2 }, + {PTRACE_PEEKTEXT , .addr =3 }, + {PTRACE_PEEKTEXT , .addr =-1 }, + {PTRACE_PEEKTEXT , .addr =-2 }, + {PTRACE_PEEKTEXT , .addr =-3 }, + {PTRACE_PEEKTEXT , .addr =-4 }, + {PTRACE_PEEKUSER , .addr =SIZEOF_USER +1 }, + {PTRACE_PEEKUSER , .addr =SIZEOF_USER +2 }, + {PTRACE_PEEKUSER , .addr =SIZEOF_USER +3 }, + {PTRACE_PEEKUSER , .addr =SIZEOF_USER +4 }, + {PTRACE_PEEKUSER , .addr =-1 }, + {PTRACE_PEEKUSER , .addr =-2 }, + {PTRACE_PEEKUSER , .addr =-3 }, + {PTRACE_PEEKUSER , .addr =-4 }, + {PTRACE_POKEDATA , .addr =0 }, + {PTRACE_POKEDATA , .addr =1 }, + {PTRACE_POKEDATA , .addr =2 }, + {PTRACE_POKEDATA , .addr =3 }, + {PTRACE_POKEDATA , .addr =-1 }, + {PTRACE_POKEDATA , .addr =-2 }, + {PTRACE_POKEDATA , .addr =-3 }, + {PTRACE_POKEDATA , .addr =-4 }, + {PTRACE_POKETEXT , .addr =0 }, + {PTRACE_POKETEXT , .addr =1 }, + {PTRACE_POKETEXT , .addr =2 }, + {PTRACE_POKETEXT , .addr =3 }, + {PTRACE_POKETEXT , .addr =-1 }, + {PTRACE_POKETEXT , .addr =-2 }, + {PTRACE_POKETEXT , .addr =-3 }, + {PTRACE_POKETEXT , .addr =-4 }, + {PTRACE_POKEUSER , .addr =SIZEOF_USER +1 }, + {PTRACE_POKEUSER , .addr =SIZEOF_USER +2 }, + {PTRACE_POKEUSER , .addr =SIZEOF_USER +3 }, + {PTRACE_POKEUSER , .addr =SIZEOF_USER +4 }, + {PTRACE_POKEUSER , .addr =-1 }, + {PTRACE_POKEUSER , .addr =-2 }, + {PTRACE_POKEUSER , .addr =-3 }, + {PTRACE_POKEUSER , .addr =-4 }, #ifdef PTRACE_GETREGS - { -PTRACE_GETREGS ,.data =0 }, { -PTRACE_GETREGS ,.data =1 }, { -PTRACE_GETREGS ,.data =2 }, { -PTRACE_GETREGS ,.data =3 }, { -PTRACE_GETREGS ,.data =-1 }, { -PTRACE_GETREGS ,.data =-2 }, { -PTRACE_GETREGS ,.data =-3 }, { -PTRACE_GETREGS ,.data =-4 }, + {PTRACE_GETREGS , .data =0 }, + {PTRACE_GETREGS , .data =1 }, + {PTRACE_GETREGS , .data =2 }, + {PTRACE_GETREGS , .data =3 }, + {PTRACE_GETREGS , .data =-1 }, + {PTRACE_GETREGS , .data =-2 }, + {PTRACE_GETREGS , .data =-3 }, + {PTRACE_GETREGS , .data =-4 }, #endif #ifdef PTRACE_GETFGREGS - { -PTRACE_GETFGREGS ,.data =0 }, { -PTRACE_GETFGREGS ,.data =1 }, { -PTRACE_GETFGREGS ,.data =2 }, { -PTRACE_GETFGREGS ,.data =3 }, { -PTRACE_GETFGREGS ,.data =-1 }, { -PTRACE_GETFGREGS ,.data =-2 }, { -PTRACE_GETFGREGS ,.data =-3 }, { -PTRACE_GETFGREGS ,.data =-4 }, + {PTRACE_GETFGREGS , .data =0 }, + {PTRACE_GETFGREGS , .data =1 }, + {PTRACE_GETFGREGS , .data =2 }, + {PTRACE_GETFGREGS , .data =3 }, + {PTRACE_GETFGREGS , .data =-1 }, + {PTRACE_GETFGREGS , .data =-2 }, + {PTRACE_GETFGREGS , .data =-3 }, + {PTRACE_GETFGREGS , .data =-4 }, #endif #ifdef PTRACE_SETREGS - { -PTRACE_SETREGS ,.data =0 }, { -PTRACE_SETREGS ,.data =1 }, { -PTRACE_SETREGS ,.data =2 }, { -PTRACE_SETREGS ,.data =3 }, { -PTRACE_SETREGS ,.data =-1 }, { -PTRACE_SETREGS ,.data =-2 }, { -PTRACE_SETREGS ,.data =-3 }, { -PTRACE_SETREGS ,.data =-4 }, + {PTRACE_SETREGS , .data =0 }, + {PTRACE_SETREGS , .data =1 }, + {PTRACE_SETREGS , .data =2 }, + {PTRACE_SETREGS , .data =3 }, + {PTRACE_SETREGS , .data =-1 }, + {PTRACE_SETREGS , .data =-2 }, + {PTRACE_SETREGS , .data =-3 }, + {PTRACE_SETREGS , .data =-4 }, #endif #ifdef PTRACE_SETFGREGS - { -PTRACE_SETFGREGS ,.data =0 }, { -PTRACE_SETFGREGS ,.data =1 }, { -PTRACE_SETFGREGS ,.data =2 }, { -PTRACE_SETFGREGS ,.data =3 }, { -PTRACE_SETFGREGS ,.data =-1 }, { -PTRACE_SETFGREGS ,.data =-2 }, { -PTRACE_SETFGREGS ,.data =-3 }, { -PTRACE_SETFGREGS ,.data =-4 }, + {PTRACE_SETFGREGS , .data =0 }, + {PTRACE_SETFGREGS , .data =1 }, + {PTRACE_SETFGREGS , .data =2 }, + {PTRACE_SETFGREGS , .data =3 }, + {PTRACE_SETFGREGS , .data =-1 }, + {PTRACE_SETFGREGS , .data =-2 }, + {PTRACE_SETFGREGS , .data =-3 }, + {PTRACE_SETFGREGS , .data =-4 }, #endif #if HAVE_DECL_PTRACE_GETSIGINFO - { -PTRACE_GETSIGINFO ,.data =0 }, { -PTRACE_GETSIGINFO ,.data =1 }, { -PTRACE_GETSIGINFO ,.data =2 }, { -PTRACE_GETSIGINFO ,.data =3 }, { -PTRACE_GETSIGINFO ,.data =-1 }, { -PTRACE_GETSIGINFO ,.data =-2 }, { -PTRACE_GETSIGINFO ,.data =-3 }, { -PTRACE_GETSIGINFO ,.data =-4 }, + {PTRACE_GETSIGINFO , .data =0 }, + {PTRACE_GETSIGINFO , .data =1 }, + {PTRACE_GETSIGINFO , .data =2 }, + {PTRACE_GETSIGINFO , .data =3 }, + {PTRACE_GETSIGINFO , .data =-1 }, + {PTRACE_GETSIGINFO , .data =-2 }, + {PTRACE_GETSIGINFO , .data =-3 }, + {PTRACE_GETSIGINFO , .data =-4 }, #endif #if HAVE_DECL_PTRACE_SETSIGINFO - { -PTRACE_SETSIGINFO ,.data =0 }, { -PTRACE_SETSIGINFO ,.data =1 }, { -PTRACE_SETSIGINFO ,.data =2 }, { -PTRACE_SETSIGINFO ,.data =3 }, { -PTRACE_SETSIGINFO ,.data =-1 }, { -PTRACE_SETSIGINFO ,.data =-2 }, { -PTRACE_SETSIGINFO ,.data =-3 }, { -PTRACE_SETSIGINFO ,.data =-4 }, + {PTRACE_SETSIGINFO , .data =0 }, + {PTRACE_SETSIGINFO , .data =1 }, + {PTRACE_SETSIGINFO , .data =2 }, + {PTRACE_SETSIGINFO , .data =3 }, + {PTRACE_SETSIGINFO , .data =-1 }, + {PTRACE_SETSIGINFO , .data =-2 }, + {PTRACE_SETSIGINFO , .data =-3 }, + {PTRACE_SETSIGINFO , .data =-4 }, +#endif +}; + +#define SPT (x)[PTRACE_##x] = #x, +static char *strings[] = { + SPT(TRACEME) + SPT(PEEKTEXT) + SPT(PEEKDATA) + SPT(PEEKUSER) + SPT(POKETEXT) + SPT(POKEDATA) + SPT(POKEUSER) +#ifdef PTRACE_GETREGS + SPT(GETREGS) +#endif +#ifdef PTRACE_SETREGS + SPT(SETREGS) +#endif +#ifdef PTRACE_GETSIGINFO + SPT(GETSIGINFO) #endif +#ifdef PTRACE_SETSIGINFO + SPT(SETSIGINFO) +#endif +#ifdef PTRACE_GETFGREGS + SPT(GETFGREGS) +#endif +#ifdef PTRACE_SETFGREGS + SPT(SETFGREGS) +#endif + SPT(KILL) +SPT (SINGLESTEP ) }; -int TST_TOTAL =ARRAY_SIZE (test_cases); +static void child (void ) +{ +SAFE_PTRACE (PTRACE_TRACEME ,0 ,NULL ,NULL ); +raise (SIGSTOP ); +exit (0 ); +} -int main (int argc,char *argv[]) +static void run (void ) {size_t i; -long ret; -int saved_errno; +int pid; +int status; +int exp_errnos[] = {EIO ,EFAULT }; + + pid =SAFE_FORK (); -tst_parse_opts (argc, argv,NULL ,NULL ); +if (!pid) +child (); -make_a_baby (argc, argv); +SAFE_WAIT (&status); + +if (!WIFSTOPPED (status)) +tst_brk (TBROK ,"child %d was not stopped" , pid);for (i =0 ; i <ARRAY_SIZE (test_cases); ++i) {struct test_case_t *tc = &test_cases[i]; - errno =0 ; - ret = -ptrace (tc->request, pid, (void *)tc->addr, - (void *)tc->data); - saved_errno = errno; -if (ret !=-1 ) -tst_resm (TFAIL , -"ptrace(%s, ..., %li, %li) returned %li instead of -1" , -strptrace (tc->request), tc->addr, tc->data, - ret); -else if (saved_errno !=EIO && saved_errno !=EFAULT ) -tst_resm (TFAIL , -"ptrace(%s, ..., %li, %li) expected errno EIO or EFAULT; actual: %i (%s)" , -strptrace (tc->request), tc->addr, tc->data, - saved_errno,strerror (saved_errno)); -else -tst_resm (TPASS , -"ptrace(%s, ..., %li, %li) failed as expected" , -strptrace (tc->request), tc->addr, tc->data); +TEST (ptrace (tc->request, pid, (void *)tc->addr, + (void *)tc->data)); +TST_EXP_FAIL_ARR (ptrace (tc->request, pid, (void *)tc->addr, + (void *)tc->data), exp_errnos,ARRAY_SIZE (exp_errnos), +"ptrace(%s, ..., %li, %li) failed as expected" , + strings[tc->request], tc->addr, tc->data); } -/* hopefully this worked */ -ptrace (PTRACE_KILL , pid,NULL ,NULL ); +SAFE_PTRACE (PTRACE_CONT , pid,NULL ,NULL ); -tst_exit (); } + +static struct tst_test test = { + .test_all = run, + .forks_child =1 , +};
testcases/kernel/syscalls/ptrace/ptrace06_child.c new file +16 -0
@@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2018 Linux Test Project +* Copyright (C) 2015 Cyril Hrubis [email protected] +*/ + +#define TST_NO_DEFAULT_MAIN +#include "tst_test.h" + +int main (int argc,char *argv[]) +{ + +tst_res (TPASS ,"%s executed" , argv[0 ]); + +return 0 ; +}
Signature · 5 lines
2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v7 2/2] ptrace06: Refactor the test using new LTP API
Quoted 359 lines · Wei Gao via ltp
Signed-off-by Wei Gao <[email protected]>Reviewed-by Petr Vorel <[email protected]>--- testcases/kernel/syscalls/ptrace/ptrace06.c | 325 ++++++++++-------- .../kernel/syscalls/ptrace/ptrace06_child.c | 16 + 2 files changed, 190 insertions(+), 151 deletions(-) create mode 100644 testcases/kernel/syscalls/ptrace/ptrace06_child.ctestcases/kernel/syscalls/ptrace/ptrace06.c +162
-140@@ -1,199 +1,222 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* -* check out-of-bound/unaligned addresses given to +* Copyright (c) 2008 Analog Devices Inc. +* Copyright (c) Linux Test Project, 2009-2022 +* Copyright (c) 2023 Wei Gao <[email protected]> +*/ + +/*\ +* [Description] +* +* Check out-of-bound/unaligned addresses given to +* * - {PEEK,POKE}{DATA,TEXT,USER} * - {GET,SET}{,FG}REGS * - {GET,SET}SIGINFO -* -* Copyright (c) 2008 Analog Devices Inc. -* -* Licensed under the GPL-2 or later */ -#define _GNU_SOURCE - -#include <errno.h> -#include <stdbool.h> -#include <stdio.h> #include <stdlib.h> -#include <unistd.h> #include <sys/ptrace.h> - -#include "test.h" -#include "spawn_ptrace_child.h" +#include "tst_test.h" /* this should be sizeof(struct user), but that info is only found * in the kernel asm/user.h which is not exported to userspace. */ +#if defined(__i386__) -#define SIZEOF_USER 284 +# define SIZEOF_USER 284#elif defined(__x86_64__) -#define SIZEOF_USER 928 +# define SIZEOF_USER 928#else -#define SIZEOF_USER 0x1000/* just pick a big number */ +# define SIZEOF_USER 0x1000/* just pick a big number */ #endif -char *TCID ="ptrace06" ; - -struct test_case_t { +static struct test_case_t {int request;long addr;long data; } test_cases[] = { - { -PTRACE_PEEKDATA ,.addr =0 }, { -PTRACE_PEEKDATA ,.addr =1 }, { -PTRACE_PEEKDATA ,.addr =2 }, { -PTRACE_PEEKDATA ,.addr =3 }, { -PTRACE_PEEKDATA ,.addr =-1 }, { -PTRACE_PEEKDATA ,.addr =-2 }, { -PTRACE_PEEKDATA ,.addr =-3 }, { -PTRACE_PEEKDATA ,.addr =-4 }, { -PTRACE_PEEKTEXT ,.addr =0 }, { -PTRACE_PEEKTEXT ,.addr =1 }, { -PTRACE_PEEKTEXT ,.addr =2 }, { -PTRACE_PEEKTEXT ,.addr =3 }, { -PTRACE_PEEKTEXT ,.addr =-1 }, { -PTRACE_PEEKTEXT ,.addr =-2 }, { -PTRACE_PEEKTEXT ,.addr =-3 }, { -PTRACE_PEEKTEXT ,.addr =-4 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +1 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +2 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +3 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +4 }, { -PTRACE_PEEKUSER ,.addr =-1 }, { -PTRACE_PEEKUSER ,.addr =-2 }, { -PTRACE_PEEKUSER ,.addr =-3 }, { -PTRACE_PEEKUSER ,.addr =-4 }, { -PTRACE_POKEDATA ,.addr =0 }, { -PTRACE_POKEDATA ,.addr =1 }, { -PTRACE_POKEDATA ,.addr =2 }, { -PTRACE_POKEDATA ,.addr =3 }, { -PTRACE_POKEDATA ,.addr =-1 }, { -PTRACE_POKEDATA ,.addr =-2 }, { -PTRACE_POKEDATA ,.addr =-3 }, { -PTRACE_POKEDATA ,.addr =-4 }, { -PTRACE_POKETEXT ,.addr =0 }, { -PTRACE_POKETEXT ,.addr =1 }, { -PTRACE_POKETEXT ,.addr =2 }, { -PTRACE_POKETEXT ,.addr =3 }, { -PTRACE_POKETEXT ,.addr =-1 }, { -PTRACE_POKETEXT ,.addr =-2 }, { -PTRACE_POKETEXT ,.addr =-3 }, { -PTRACE_POKETEXT ,.addr =-4 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +1 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +2 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +3 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +4 }, { -PTRACE_POKEUSER ,.addr =-1 }, { -PTRACE_POKEUSER ,.addr =-2 }, { -PTRACE_POKEUSER ,.addr =-3 }, { -PTRACE_POKEUSER ,.addr =-4 }, + {PTRACE_PEEKDATA , .addr =0 }, + {PTRACE_PEEKDATA , .addr =1 }, + {PTRACE_PEEKDATA , .addr =2 }, + {PTRACE_PEEKDATA , .addr =3 }, + {PTRACE_PEEKDATA , .addr =-1 }, + {PTRACE_PEEKDATA , .addr =-2 }, + {PTRACE_PEEKDATA , .addr =-3 }, + {PTRACE_PEEKDATA , .addr =-4 }, + {PTRACE_PEEKTEXT , .addr =0 }, + {PTRACE_PEEKTEXT , .addr =1 }, + {PTRACE_PEEKTEXT , .addr =2 }, + {PTRACE_PEEKTEXT , .addr =3 }, + {PTRACE_PEEKTEXT , .addr =-1 }, + {PTRACE_PEEKTEXT , .addr =-2 }, + {PTRACE_PEEKTEXT , .addr =-3 }, + {PTRACE_PEEKTEXT , .addr =-4 }, + {PTRACE_PEEKUSER , .addr =SIZEOF_USER +1 }, + {PTRACE_PEEKUSER , .addr =SIZEOF_USER +2 }, + {PTRACE_PEEKUSER , .addr =SIZEOF_USER +3 }, + {PTRACE_PEEKUSER , .addr =SIZEOF_USER +4 }, + {PTRACE_PEEKUSER , .addr =-1 }, + {PTRACE_PEEKUSER , .addr =-2 }, + {PTRACE_PEEKUSER , .addr =-3 }, + {PTRACE_PEEKUSER , .addr =-4 }, + {PTRACE_POKEDATA , .addr =0 }, + {PTRACE_POKEDATA , .addr =1 }, + {PTRACE_POKEDATA , .addr =2 }, + {PTRACE_POKEDATA , .addr =3 }, + {PTRACE_POKEDATA , .addr =-1 }, + {PTRACE_POKEDATA , .addr =-2 }, + {PTRACE_POKEDATA , .addr =-3 }, + {PTRACE_POKEDATA , .addr =-4 }, + {PTRACE_POKETEXT , .addr =0 }, + {PTRACE_POKETEXT , .addr =1 }, + {PTRACE_POKETEXT , .addr =2 }, + {PTRACE_POKETEXT , .addr =3 }, + {PTRACE_POKETEXT , .addr =-1 }, + {PTRACE_POKETEXT , .addr =-2 }, + {PTRACE_POKETEXT , .addr =-3 }, + {PTRACE_POKETEXT , .addr =-4 }, + {PTRACE_POKEUSER , .addr =SIZEOF_USER +1 }, + {PTRACE_POKEUSER , .addr =SIZEOF_USER +2 }, + {PTRACE_POKEUSER , .addr =SIZEOF_USER +3 }, + {PTRACE_POKEUSER , .addr =SIZEOF_USER +4 }, + {PTRACE_POKEUSER , .addr =-1 }, + {PTRACE_POKEUSER , .addr =-2 }, + {PTRACE_POKEUSER , .addr =-3 }, + {PTRACE_POKEUSER , .addr =-4 }, #ifdef PTRACE_GETREGS - { -PTRACE_GETREGS ,.data =0 }, { -PTRACE_GETREGS ,.data =1 }, { -PTRACE_GETREGS ,.data =2 }, { -PTRACE_GETREGS ,.data =3 }, { -PTRACE_GETREGS ,.data =-1 }, { -PTRACE_GETREGS ,.data =-2 }, { -PTRACE_GETREGS ,.data =-3 }, { -PTRACE_GETREGS ,.data =-4 }, + {PTRACE_GETREGS , .data =0 }, + {PTRACE_GETREGS , .data =1 }, + {PTRACE_GETREGS , .data =2 }, + {PTRACE_GETREGS , .data =3 }, + {PTRACE_GETREGS , .data =-1 }, + {PTRACE_GETREGS , .data =-2 }, + {PTRACE_GETREGS , .data =-3 }, + {PTRACE_GETREGS , .data =-4 }, #endif #ifdef PTRACE_GETFGREGS - { -PTRACE_GETFGREGS ,.data =0 }, { -PTRACE_GETFGREGS ,.data =1 }, { -PTRACE_GETFGREGS ,.data =2 }, { -PTRACE_GETFGREGS ,.data =3 }, { -PTRACE_GETFGREGS ,.data =-1 }, { -PTRACE_GETFGREGS ,.data =-2 }, { -PTRACE_GETFGREGS ,.data =-3 }, { -PTRACE_GETFGREGS ,.data =-4 }, + {PTRACE_GETFGREGS , .data =0 }, + {PTRACE_GETFGREGS , .data =1 }, + {PTRACE_GETFGREGS , .data =2 }, + {PTRACE_GETFGREGS , .data =3 }, + {PTRACE_GETFGREGS , .data =-1 }, + {PTRACE_GETFGREGS , .data =-2 }, + {PTRACE_GETFGREGS , .data =-3 }, + {PTRACE_GETFGREGS , .data =-4 }, #endif #ifdef PTRACE_SETREGS - { -PTRACE_SETREGS ,.data =0 }, { -PTRACE_SETREGS ,.data =1 }, { -PTRACE_SETREGS ,.data =2 }, { -PTRACE_SETREGS ,.data =3 }, { -PTRACE_SETREGS ,.data =-1 }, { -PTRACE_SETREGS ,.data =-2 }, { -PTRACE_SETREGS ,.data =-3 }, { -PTRACE_SETREGS ,.data =-4 }, + {PTRACE_SETREGS , .data =0 }, + {PTRACE_SETREGS , .data =1 }, + {PTRACE_SETREGS , .data =2 }, + {PTRACE_SETREGS , .data =3 }, + {PTRACE_SETREGS , .data =-1 }, + {PTRACE_SETREGS , .data =-2 }, + {PTRACE_SETREGS , .data =-3 }, + {PTRACE_SETREGS , .data =-4 }, #endif #ifdef PTRACE_SETFGREGS - { -PTRACE_SETFGREGS ,.data =0 }, { -PTRACE_SETFGREGS ,.data =1 }, { -PTRACE_SETFGREGS ,.data =2 }, { -PTRACE_SETFGREGS ,.data =3 }, { -PTRACE_SETFGREGS ,.data =-1 }, { -PTRACE_SETFGREGS ,.data =-2 }, { -PTRACE_SETFGREGS ,.data =-3 }, { -PTRACE_SETFGREGS ,.data =-4 }, + {PTRACE_SETFGREGS , .data =0 }, + {PTRACE_SETFGREGS , .data =1 }, + {PTRACE_SETFGREGS , .data =2 }, + {PTRACE_SETFGREGS , .data =3 }, + {PTRACE_SETFGREGS , .data =-1 }, + {PTRACE_SETFGREGS , .data =-2 }, + {PTRACE_SETFGREGS , .data =-3 }, + {PTRACE_SETFGREGS , .data =-4 }, #endif #if HAVE_DECL_PTRACE_GETSIGINFO - { -PTRACE_GETSIGINFO ,.data =0 }, { -PTRACE_GETSIGINFO ,.data =1 }, { -PTRACE_GETSIGINFO ,.data =2 }, { -PTRACE_GETSIGINFO ,.data =3 }, { -PTRACE_GETSIGINFO ,.data =-1 }, { -PTRACE_GETSIGINFO ,.data =-2 }, { -PTRACE_GETSIGINFO ,.data =-3 }, { -PTRACE_GETSIGINFO ,.data =-4 }, + {PTRACE_GETSIGINFO , .data =0 }, + {PTRACE_GETSIGINFO , .data =1 }, + {PTRACE_GETSIGINFO , .data =2 }, + {PTRACE_GETSIGINFO , .data =3 }, + {PTRACE_GETSIGINFO , .data =-1 }, + {PTRACE_GETSIGINFO , .data =-2 }, + {PTRACE_GETSIGINFO , .data =-3 }, + {PTRACE_GETSIGINFO , .data =-4 }, #endif #if HAVE_DECL_PTRACE_SETSIGINFO - { -PTRACE_SETSIGINFO ,.data =0 }, { -PTRACE_SETSIGINFO ,.data =1 }, { -PTRACE_SETSIGINFO ,.data =2 }, { -PTRACE_SETSIGINFO ,.data =3 }, { -PTRACE_SETSIGINFO ,.data =-1 }, { -PTRACE_SETSIGINFO ,.data =-2 }, { -PTRACE_SETSIGINFO ,.data =-3 }, { -PTRACE_SETSIGINFO ,.data =-4 }, + {PTRACE_SETSIGINFO , .data =0 }, + {PTRACE_SETSIGINFO , .data =1 }, + {PTRACE_SETSIGINFO , .data =2 }, + {PTRACE_SETSIGINFO , .data =3 }, + {PTRACE_SETSIGINFO , .data =-1 }, + {PTRACE_SETSIGINFO , .data =-2 }, + {PTRACE_SETSIGINFO , .data =-3 }, + {PTRACE_SETSIGINFO , .data =-4 }, +#endif +}; + +#define SPT (x)[PTRACE_##x] = #x, +static char *strings[] = { + SPT(TRACEME) + SPT(PEEKTEXT) + SPT(PEEKDATA) + SPT(PEEKUSER) + SPT(POKETEXT) + SPT(POKEDATA) + SPT(POKEUSER) +#ifdef PTRACE_GETREGS + SPT(GETREGS) +#endif +#ifdef PTRACE_SETREGS + SPT(SETREGS) +#endif +#ifdef PTRACE_GETSIGINFO + SPT(GETSIGINFO) #endif +#ifdef PTRACE_SETSIGINFO + SPT(SETSIGINFO) +#endif +#ifdef PTRACE_GETFGREGS + SPT(GETFGREGS) +#endif +#ifdef PTRACE_SETFGREGS + SPT(SETFGREGS) +#endif + SPT(KILL) +SPT (SINGLESTEP ) }; -int TST_TOTAL =ARRAY_SIZE (test_cases); +static void child (void ) +{ +SAFE_PTRACE (PTRACE_TRACEME ,0 ,NULL ,NULL ); +raise (SIGSTOP ); +exit (0 ); +} -int main (int argc,char *argv[]) +static void run (void ) {size_t i; -long ret; -int saved_errno; +int pid; +int status; +int exp_errnos[] = {EIO ,EFAULT }; + + pid =SAFE_FORK (); -tst_parse_opts (argc, argv,NULL ,NULL ); +if (!pid) +child (); -make_a_baby (argc, argv); +SAFE_WAIT (&status); + +if (!WIFSTOPPED (status)) +tst_brk (TBROK ,"child %d was not stopped" , pid);for (i =0 ; i <ARRAY_SIZE (test_cases); ++i) {struct test_case_t *tc = &test_cases[i]; - errno =0 ; - ret = -ptrace (tc->request, pid, (void *)tc->addr, - (void *)tc->data); - saved_errno = errno; -if (ret !=-1 ) -tst_resm (TFAIL , -"ptrace(%s, ..., %li, %li) returned %li instead of -1" , -strptrace (tc->request), tc->addr, tc->data, - ret); -else if (saved_errno !=EIO && saved_errno !=EFAULT )
testcases/kernel/syscalls/ptrace/ptrace06.c line 208
Quoted 10 lines
testcases/kernel/syscalls/ptrace/ptrace06.c +2
-8-tst_resm (TFAIL , -"ptrace(%s, ..., %li, %li) expected errno EIO or EFAULT; actual: %i (%s)" , -strptrace (tc->request), tc->addr, tc->data, - saved_errno,strerror (saved_errno)); - else - tst_resm(TPASS, -"ptrace(%s, ..., %li, %li) failed as expected" , - strptrace(tc->request), tc->addr, tc->data); +TEST (ptrace (tc->request, pid, (void *)tc->addr, + (void *)tc->data));
This test is not useful here, have you forget to remove this macro after TST_EXP_FAIL_ARR() has been added?
Quoted 29 lines
testcases/kernel/syscalls/ptrace/ptrace06.c +10
-3+TST_EXP_FAIL_ARR (ptrace (tc->request, pid, (void *)tc->addr, + (void *)tc->data), exp_errnos,ARRAY_SIZE (exp_errnos), +"ptrace(%s, ..., %li, %li) failed as expected" , + strings[tc->request], tc->addr, tc->data); } -/* hopefully this worked */ -ptrace (PTRACE_KILL , pid,NULL ,NULL ); +SAFE_PTRACE (PTRACE_CONT , pid,NULL ,NULL ); -tst_exit (); } + +static struct tst_test test = { + .test_all = run, + .forks_child =1 , +};testcases/kernel/syscalls/ptrace/ptrace06_child.c new file +6
-0@@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2018 Linux Test Project +* Copyright (C) 2015 Cyril Hrubis [email protected] +*/ +
testcases/kernel/syscalls/ptrace/ptrace06_child.c line 16
Quoted 10 lines
testcases/kernel/syscalls/ptrace/ptrace06_child.c new file +10
-0+#define TST_NO_DEFAULT_MAIN +#include "tst_test.h" + +int main (int argc,char *argv[]) +{ + +tst_res (TPASS ,"%s executed" , argv[0 ]); + +return 0 ; +}
This program does not appear to be used at all.
With the useless parts removed:
Signature · 5 lines
Cyril Hrubis [email protected] -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v7 2/2] ptrace06: Refactor the test using new LTP API
In reply to Wei Gao via ltpHi Wei,
...
testcases/kernel/syscalls/ptrace/ptrace06_child.c line 10
Quoted 13 lines
testcases/kernel/syscalls/ptrace/ptrace06_child.c new file +10
-0@@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2018 Linux Test Project +* Copyright (C) 2015 Cyril Hrubis [email protected] +*/ + +#define TST_NO_DEFAULT_MAIN +#include "tst_test.h" + +int main (int argc,char *argv[])
ptrace06_child.c:10:14: warning: unused parameter ‘argc’ [-Wunused-parameter]
10 | int main(int argc, char *argv[])
testcases/kernel/syscalls/ptrace/ptrace06_child.c line 12
Quoted 2 lines
testcases/kernel/syscalls/ptrace/ptrace06_child.c new file +2
-0+{ +
nit: empty line ^
testcases/kernel/syscalls/ptrace/ptrace06_child.c line 16
Quoted 4 lines
testcases/kernel/syscalls/ptrace/ptrace06_child.c new file +4
-0+tst_res (TPASS ,"%s executed" , argv[0 ]); + +return 0 ; +}
I suggest to merge the patchset with this change in this commit.
@Cyril: Can I add your RBT?
Kind regards,
Petr
+++ testcases/kernel/syscalls/ptrace/ptrace06_child.c @@ -7,9 +7,8 @@
#define TST_NO_DEFAULT_MAIN
#include "tst_test.h"
-int main(int argc, char *argv[])
+int main(int argc LTP_ATTRIBUTE_UNUSED, char *argv[])
{
-
tst_res(TPASS, "%s executed", argv[0]);
return 0;
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v7 2/2] ptrace06: Refactor the test using new LTP API
Hi!
Quoted 16 lines
testcases/kernel/syscalls/ptrace/ptrace06_child.c line 10
Quoted 9 lines
testcases/kernel/syscalls/ptrace/ptrace06_child.c new file +9
-0+/* +* Copyright (c) 2018 Linux Test Project +* Copyright (C) 2015 Cyril Hrubis [email protected] +*/ + +#define TST_NO_DEFAULT_MAIN +#include "tst_test.h" + +int main (int argc,char *argv[])ptrace06_child.c:10:14: warning: unused parameter ‘argc’ [-Wunused-parameter]
10 | intmain(int argc, char *argv[])Review
Quoted 2 lines
(quoted diff) +2
-0+{ +nit: empty line ^
Quoted 8 lines
testcases/kernel/syscalls/ptrace/ptrace06_child.c line 16
Quoted 4 lines
testcases/kernel/syscalls/ptrace/ptrace06_child.c new file +4
-0+tst_res (TPASS ,"%s executed" , argv[0 ]); + +return 0 ; +}I suggest to merge the patchset with this change in this commit.
@Cyril: Can I add your RBT?
Have you seen my review? That file is not used at all. And also the TEST() statement in the actual test.
Signature · 5 lines
Cyril Hrubis [email protected] -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v7 2/2] ptrace06: Refactor the test using new LTP API
Quoted 24 lines
Hi!
Quoted 22 lines
testcases/kernel/syscalls/ptrace/ptrace06_child.c line 10
Quoted 9 lines
testcases/kernel/syscalls/ptrace/ptrace06_child.c new file +9
-0+/* +* Copyright (c) 2018 Linux Test Project +* Copyright (C) 2015 Cyril Hrubis [email protected] +*/ + +#define TST_NO_DEFAULT_MAIN +#include "tst_test.h" + +int main (int argc,char *argv[])ptrace06_child.c:10:14: warning: unused parameter ‘argc’ [-Wunused-parameter]
10 | intmain(int argc, char *argv[])Review
Quoted 2 lines
(quoted diff) +2
-0+{ +nit: empty line ^
testcases/kernel/syscalls/ptrace/ptrace06_child.c line 16
Quoted 4 lines
testcases/kernel/syscalls/ptrace/ptrace06_child.c new file +4
-0+tst_res (TPASS ,"%s executed" , argv[0 ]); + +return 0 ; +}I suggest to merge the patchset with this change in this commit.
Quoted 4 lines
Quoted 1 line
@Cyril: Can I add your RBT?
Have you seen my review? That file is not used at all. And also the
TEST()statement in the actual test.
I'm sorry I overlooked it. First commit is merged with your RBT. And I'm sorry not catching these.
For this patch I ptrace06_child.c and merged. But because there is TEST(ptrace, ... left, I dared to removed it again (with git push -f), Wei please send another version (I guess without my RBT as the code changed a lot since I add the tag).
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
v8 cover ptrace: Refactor
In reply to Wei Gao via ltpWei Gao (2):
ptrace06: Refactor the test using new LTP API ptrace06_child.c: Remove unused ptrace06_child.c
testcases/kernel/syscalls/ptrace/ptrace06.c | 323 +++++++++++--------- 1 file changed, 172 insertions(+), 151 deletions(-)
Signature · 5 lines
2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v8 1/2 ptrace06: Refactor the test using new LTP API
--- testcases/kernel/syscalls/ptrace/ptrace06.c | 323 ++++++++++-------- .../kernel/syscalls/ptrace/ptrace06_child.c | 16 + 2 files changed, 188 insertions(+), 151 deletions(-) create mode 100644 testcases/kernel/syscalls/ptrace/ptrace06_child.c
testcases/kernel/syscalls/ptrace/ptrace06.c +172 -151
@@ -1,199 +1,220 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* -* check out-of-bound/unaligned addresses given to +* Copyright (c) 2008 Analog Devices Inc. +* Copyright (c) Linux Test Project, 2009-2022 +* Copyright (c) 2023 Wei Gao <[email protected]> +*/ + +/*\ +* [Description] +* +* Check out-of-bound/unaligned addresses given to +* * - {PEEK,POKE}{DATA,TEXT,USER} * - {GET,SET}{,FG}REGS * - {GET,SET}SIGINFO -* -* Copyright (c) 2008 Analog Devices Inc. -* -* Licensed under the GPL-2 or later */ -#define _GNU_SOURCE - -#include <errno.h> -#include <stdbool.h> -#include <stdio.h> #include <stdlib.h> -#include <unistd.h> #include <sys/ptrace.h> - -#include "test.h" -#include "spawn_ptrace_child.h" +#include "tst_test.h" /* this should be sizeof(struct user), but that info is only found * in the kernel asm/user.h which is not exported to userspace. */ +#if defined(__i386__) -#define SIZEOF_USER 284 +# define SIZEOF_USER 284#elif defined(__x86_64__) -#define SIZEOF_USER 928 +# define SIZEOF_USER 928#else -#define SIZEOF_USER 0x1000/* just pick a big number */ +# define SIZEOF_USER 0x1000/* just pick a big number */ #endif -char *TCID ="ptrace06" ; - -struct test_case_t { +static struct test_case_t {int request;long addr;long data; } test_cases[] = { - { -PTRACE_PEEKDATA ,.addr =0 }, { -PTRACE_PEEKDATA ,.addr =1 }, { -PTRACE_PEEKDATA ,.addr =2 }, { -PTRACE_PEEKDATA ,.addr =3 }, { -PTRACE_PEEKDATA ,.addr =-1 }, { -PTRACE_PEEKDATA ,.addr =-2 }, { -PTRACE_PEEKDATA ,.addr =-3 }, { -PTRACE_PEEKDATA ,.addr =-4 }, { -PTRACE_PEEKTEXT ,.addr =0 }, { -PTRACE_PEEKTEXT ,.addr =1 }, { -PTRACE_PEEKTEXT ,.addr =2 }, { -PTRACE_PEEKTEXT ,.addr =3 }, { -PTRACE_PEEKTEXT ,.addr =-1 }, { -PTRACE_PEEKTEXT ,.addr =-2 }, { -PTRACE_PEEKTEXT ,.addr =-3 }, { -PTRACE_PEEKTEXT ,.addr =-4 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +1 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +2 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +3 }, { -PTRACE_PEEKUSER ,.addr =SIZEOF_USER +4 }, { -PTRACE_PEEKUSER ,.addr =-1 }, { -PTRACE_PEEKUSER ,.addr =-2 }, { -PTRACE_PEEKUSER ,.addr =-3 }, { -PTRACE_PEEKUSER ,.addr =-4 }, { -PTRACE_POKEDATA ,.addr =0 }, { -PTRACE_POKEDATA ,.addr =1 }, { -PTRACE_POKEDATA ,.addr =2 }, { -PTRACE_POKEDATA ,.addr =3 }, { -PTRACE_POKEDATA ,.addr =-1 }, { -PTRACE_POKEDATA ,.addr =-2 }, { -PTRACE_POKEDATA ,.addr =-3 }, { -PTRACE_POKEDATA ,.addr =-4 }, { -PTRACE_POKETEXT ,.addr =0 }, { -PTRACE_POKETEXT ,.addr =1 }, { -PTRACE_POKETEXT ,.addr =2 }, { -PTRACE_POKETEXT ,.addr =3 }, { -PTRACE_POKETEXT ,.addr =-1 }, { -PTRACE_POKETEXT ,.addr =-2 }, { -PTRACE_POKETEXT ,.addr =-3 }, { -PTRACE_POKETEXT ,.addr =-4 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +1 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +2 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +3 }, { -PTRACE_POKEUSER ,.addr =SIZEOF_USER +4 }, { -PTRACE_POKEUSER ,.addr =-1 }, { -PTRACE_POKEUSER ,.addr =-2 }, { -PTRACE_POKEUSER ,.addr =-3 }, { -PTRACE_POKEUSER ,.addr =-4 }, + {PTRACE_PEEKDATA , .addr =0 }, + {PTRACE_PEEKDATA , .addr =1 }, + {PTRACE_PEEKDATA , .addr =2 }, + {PTRACE_PEEKDATA , .addr =3 }, + {PTRACE_PEEKDATA , .addr =-1 }, + {PTRACE_PEEKDATA , .addr =-2 }, + {PTRACE_PEEKDATA , .addr =-3 }, + {PTRACE_PEEKDATA , .addr =-4 }, + {PTRACE_PEEKTEXT , .addr =0 }, + {PTRACE_PEEKTEXT , .addr =1 }, + {PTRACE_PEEKTEXT , .addr =2 }, + {PTRACE_PEEKTEXT , .addr =3 }, + {PTRACE_PEEKTEXT , .addr =-1 }, + {PTRACE_PEEKTEXT , .addr =-2 }, + {PTRACE_PEEKTEXT , .addr =-3 }, + {PTRACE_PEEKTEXT , .addr =-4 }, + {PTRACE_PEEKUSER , .addr =SIZEOF_USER +1 }, + {PTRACE_PEEKUSER , .addr =SIZEOF_USER +2 }, + {PTRACE_PEEKUSER , .addr =SIZEOF_USER +3 }, + {PTRACE_PEEKUSER , .addr =SIZEOF_USER +4 }, + {PTRACE_PEEKUSER , .addr =-1 }, + {PTRACE_PEEKUSER , .addr =-2 }, + {PTRACE_PEEKUSER , .addr =-3 }, + {PTRACE_PEEKUSER , .addr =-4 }, + {PTRACE_POKEDATA , .addr =0 }, + {PTRACE_POKEDATA , .addr =1 }, + {PTRACE_POKEDATA , .addr =2 }, + {PTRACE_POKEDATA , .addr =3 }, + {PTRACE_POKEDATA , .addr =-1 }, + {PTRACE_POKEDATA , .addr =-2 }, + {PTRACE_POKEDATA , .addr =-3 }, + {PTRACE_POKEDATA , .addr =-4 }, + {PTRACE_POKETEXT , .addr =0 }, + {PTRACE_POKETEXT , .addr =1 }, + {PTRACE_POKETEXT , .addr =2 }, + {PTRACE_POKETEXT , .addr =3 }, + {PTRACE_POKETEXT , .addr =-1 }, + {PTRACE_POKETEXT , .addr =-2 }, + {PTRACE_POKETEXT , .addr =-3 }, + {PTRACE_POKETEXT , .addr =-4 }, + {PTRACE_POKEUSER , .addr =SIZEOF_USER +1 }, + {PTRACE_POKEUSER , .addr =SIZEOF_USER +2 }, + {PTRACE_POKEUSER , .addr =SIZEOF_USER +3 }, + {PTRACE_POKEUSER , .addr =SIZEOF_USER +4 }, + {PTRACE_POKEUSER , .addr =-1 }, + {PTRACE_POKEUSER , .addr =-2 }, + {PTRACE_POKEUSER , .addr =-3 }, + {PTRACE_POKEUSER , .addr =-4 }, #ifdef PTRACE_GETREGS - { -PTRACE_GETREGS ,.data =0 }, { -PTRACE_GETREGS ,.data =1 }, { -PTRACE_GETREGS ,.data =2 }, { -PTRACE_GETREGS ,.data =3 }, { -PTRACE_GETREGS ,.data =-1 }, { -PTRACE_GETREGS ,.data =-2 }, { -PTRACE_GETREGS ,.data =-3 }, { -PTRACE_GETREGS ,.data =-4 }, + {PTRACE_GETREGS , .data =0 }, + {PTRACE_GETREGS , .data =1 }, + {PTRACE_GETREGS , .data =2 }, + {PTRACE_GETREGS , .data =3 }, + {PTRACE_GETREGS , .data =-1 }, + {PTRACE_GETREGS , .data =-2 }, + {PTRACE_GETREGS , .data =-3 }, + {PTRACE_GETREGS , .data =-4 }, #endif #ifdef PTRACE_GETFGREGS - { -PTRACE_GETFGREGS ,.data =0 }, { -PTRACE_GETFGREGS ,.data =1 }, { -PTRACE_GETFGREGS ,.data =2 }, { -PTRACE_GETFGREGS ,.data =3 }, { -PTRACE_GETFGREGS ,.data =-1 }, { -PTRACE_GETFGREGS ,.data =-2 }, { -PTRACE_GETFGREGS ,.data =-3 }, { -PTRACE_GETFGREGS ,.data =-4 }, + {PTRACE_GETFGREGS , .data =0 }, + {PTRACE_GETFGREGS , .data =1 }, + {PTRACE_GETFGREGS , .data =2 }, + {PTRACE_GETFGREGS , .data =3 }, + {PTRACE_GETFGREGS , .data =-1 }, + {PTRACE_GETFGREGS , .data =-2 }, + {PTRACE_GETFGREGS , .data =-3 }, + {PTRACE_GETFGREGS , .data =-4 }, #endif #ifdef PTRACE_SETREGS - { -PTRACE_SETREGS ,.data =0 }, { -PTRACE_SETREGS ,.data =1 }, { -PTRACE_SETREGS ,.data =2 }, { -PTRACE_SETREGS ,.data =3 }, { -PTRACE_SETREGS ,.data =-1 }, { -PTRACE_SETREGS ,.data =-2 }, { -PTRACE_SETREGS ,.data =-3 }, { -PTRACE_SETREGS ,.data =-4 }, + {PTRACE_SETREGS , .data =0 }, + {PTRACE_SETREGS , .data =1 }, + {PTRACE_SETREGS , .data =2 }, + {PTRACE_SETREGS , .data =3 }, + {PTRACE_SETREGS , .data =-1 }, + {PTRACE_SETREGS , .data =-2 }, + {PTRACE_SETREGS , .data =-3 }, + {PTRACE_SETREGS , .data =-4 }, #endif #ifdef PTRACE_SETFGREGS - { -PTRACE_SETFGREGS ,.data =0 }, { -PTRACE_SETFGREGS ,.data =1 }, { -PTRACE_SETFGREGS ,.data =2 }, { -PTRACE_SETFGREGS ,.data =3 }, { -PTRACE_SETFGREGS ,.data =-1 }, { -PTRACE_SETFGREGS ,.data =-2 }, { -PTRACE_SETFGREGS ,.data =-3 }, { -PTRACE_SETFGREGS ,.data =-4 }, + {PTRACE_SETFGREGS , .data =0 }, + {PTRACE_SETFGREGS , .data =1 }, + {PTRACE_SETFGREGS , .data =2 }, + {PTRACE_SETFGREGS , .data =3 }, + {PTRACE_SETFGREGS , .data =-1 }, + {PTRACE_SETFGREGS , .data =-2 }, + {PTRACE_SETFGREGS , .data =-3 }, + {PTRACE_SETFGREGS , .data =-4 }, #endif #if HAVE_DECL_PTRACE_GETSIGINFO - { -PTRACE_GETSIGINFO ,.data =0 }, { -PTRACE_GETSIGINFO ,.data =1 }, { -PTRACE_GETSIGINFO ,.data =2 }, { -PTRACE_GETSIGINFO ,.data =3 }, { -PTRACE_GETSIGINFO ,.data =-1 }, { -PTRACE_GETSIGINFO ,.data =-2 }, { -PTRACE_GETSIGINFO ,.data =-3 }, { -PTRACE_GETSIGINFO ,.data =-4 }, + {PTRACE_GETSIGINFO , .data =0 }, + {PTRACE_GETSIGINFO , .data =1 }, + {PTRACE_GETSIGINFO , .data =2 }, + {PTRACE_GETSIGINFO , .data =3 }, + {PTRACE_GETSIGINFO , .data =-1 }, + {PTRACE_GETSIGINFO , .data =-2 }, + {PTRACE_GETSIGINFO , .data =-3 }, + {PTRACE_GETSIGINFO , .data =-4 }, #endif #if HAVE_DECL_PTRACE_SETSIGINFO - { -PTRACE_SETSIGINFO ,.data =0 }, { -PTRACE_SETSIGINFO ,.data =1 }, { -PTRACE_SETSIGINFO ,.data =2 }, { -PTRACE_SETSIGINFO ,.data =3 }, { -PTRACE_SETSIGINFO ,.data =-1 }, { -PTRACE_SETSIGINFO ,.data =-2 }, { -PTRACE_SETSIGINFO ,.data =-3 }, { -PTRACE_SETSIGINFO ,.data =-4 }, + {PTRACE_SETSIGINFO , .data =0 }, + {PTRACE_SETSIGINFO , .data =1 }, + {PTRACE_SETSIGINFO , .data =2 }, + {PTRACE_SETSIGINFO , .data =3 }, + {PTRACE_SETSIGINFO , .data =-1 }, + {PTRACE_SETSIGINFO , .data =-2 }, + {PTRACE_SETSIGINFO , .data =-3 }, + {PTRACE_SETSIGINFO , .data =-4 }, +#endif +}; + +#define SPT (x)[PTRACE_##x] = #x, +static char *strings[] = { + SPT(TRACEME) + SPT(PEEKTEXT) + SPT(PEEKDATA) + SPT(PEEKUSER) + SPT(POKETEXT) + SPT(POKEDATA) + SPT(POKEUSER) +#ifdef PTRACE_GETREGS + SPT(GETREGS) +#endif +#ifdef PTRACE_SETREGS + SPT(SETREGS) +#endif +#ifdef PTRACE_GETSIGINFO + SPT(GETSIGINFO) #endif +#ifdef PTRACE_SETSIGINFO + SPT(SETSIGINFO) +#endif +#ifdef PTRACE_GETFGREGS + SPT(GETFGREGS) +#endif +#ifdef PTRACE_SETFGREGS + SPT(SETFGREGS) +#endif + SPT(KILL) +SPT (SINGLESTEP ) }; -int TST_TOTAL =ARRAY_SIZE (test_cases); +static void child (void ) +{ +SAFE_PTRACE (PTRACE_TRACEME ,0 ,NULL ,NULL ); +raise (SIGSTOP ); +exit (0 ); +} -int main (int argc,char *argv[]) +static void run (void ) {size_t i; -long ret; -int saved_errno; +int pid; +int status; +int exp_errnos[] = {EIO ,EFAULT }; + + pid =SAFE_FORK (); -tst_parse_opts (argc, argv,NULL ,NULL ); +if (!pid) +child (); -make_a_baby (argc, argv); +SAFE_WAIT (&status); + +if (!WIFSTOPPED (status)) +tst_brk (TBROK ,"child %d was not stopped" , pid);for (i =0 ; i <ARRAY_SIZE (test_cases); ++i) {struct test_case_t *tc = &test_cases[i]; - errno =0 ; - ret = -ptrace (tc->request, pid, (void *)tc->addr, - (void *)tc->data); - saved_errno = errno; -if (ret !=-1 ) -tst_resm (TFAIL , -"ptrace(%s, ..., %li, %li) returned %li instead of -1" , -strptrace (tc->request), tc->addr, tc->data, - ret); -else if (saved_errno !=EIO && saved_errno !=EFAULT ) -tst_resm (TFAIL , -"ptrace(%s, ..., %li, %li) expected errno EIO or EFAULT; actual: %i (%s)" , -strptrace (tc->request), tc->addr, tc->data, - saved_errno,strerror (saved_errno)); -else -tst_resm (TPASS , -"ptrace(%s, ..., %li, %li) failed as expected" , -strptrace (tc->request), tc->addr, tc->data); +TST_EXP_FAIL_ARR (ptrace (tc->request, pid, (void *)tc->addr, + (void *)tc->data), exp_errnos,ARRAY_SIZE (exp_errnos), +"ptrace(%s, ..., %li, %li) failed as expected" , + strings[tc->request], tc->addr, tc->data); } -/* hopefully this worked */ -ptrace (PTRACE_KILL , pid,NULL ,NULL ); +SAFE_PTRACE (PTRACE_CONT , pid,NULL ,NULL ); -tst_exit (); } + +static struct tst_test test = { + .test_all = run, + .forks_child =1 , +};
testcases/kernel/syscalls/ptrace/ptrace06_child.c new file +16 -0
@@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2018 Linux Test Project +* Copyright (C) 2015 Cyril Hrubis [email protected] +*/ + +#define TST_NO_DEFAULT_MAIN +#include "tst_test.h" + +int main (int argc,char *argv[]) +{ + +tst_res (TPASS ,"%s executed" , argv[0 ]); + +return 0 ; +}
Signature · 5 lines
2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v8 1/2] ptrace06: Refactor the test using new LTP API
Hi Wei,
...
testcases/kernel/syscalls/ptrace/ptrace06_child.c
Quoted 5 lines
testcases/kernel/syscalls/ptrace/ptrace06_child.c new file +0
-0
Wei, you add unused ptrace06_child.c here to remove it in the next commit. Hm. I'm going to merge it without this file.
Kind regards,
Petr
Quoted 17 lines
testcases/kernel/syscalls/ptrace/ptrace06_child.c new file +16
-0@@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (c) 2018 Linux Test Project +* Copyright (C) 2015 Cyril Hrubis [email protected] +*/ + +#define TST_NO_DEFAULT_MAIN +#include "tst_test.h" + +int main (int argc,char *argv[]) +{ + +tst_res (TPASS ,"%s executed" , argv[0 ]); + +return 0 ; +}
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v8 2/2 ptrace06_child.c: Remove unused ptrace06_child.c
In reply to Wei Gao via ltp--- .../kernel/syscalls/ptrace/ptrace06_child.c | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 testcases/kernel/syscalls/ptrace/ptrace06_child.c
testcases/kernel/syscalls/ptrace/ptrace06_child.c deleted +0 -16
@@ -1,16 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -/* -* Copyright (c) 2018 Linux Test Project -* Copyright (C) 2015 Cyril Hrubis [email protected] -*/ - -#define TST_NO_DEFAULT_MAIN -#include "tst_test.h" - -int main (int argc,char *argv[]) -{ - -tst_res (TPASS ,"%s executed" , argv[0 ]); - -return 0 ; -}
Signature · 5 lines
2.35.3 -- Mailing list info: https://lists.linux.it/listinfo/ltp