Commit4b0b37d

amluto

authored and

Ingo Molnar

committed

selftests/x86/ptrace_syscall: Fix for yet more glibc interference

glibc keeps getting cleverer, and my version now turns raise() intomore than one syscall. Since the test relies on ptrace seeing anexact set of syscalls, this breaks the test. Replace raise(SIGSTOP)with syscall(SYS_tgkill, ...) to force glibc to get out of our way.Signed-off-by: Andy Lutomirski <luto@kernel.org>Cc: Borislav Petkov <bp@alien8.de>Cc: Linus Torvalds <torvalds@linux-foundation.org>Cc: Peter Zijlstra <peterz@infradead.org>Cc: Thomas Gleixner <tglx@linutronix.de>Cc: linux-kselftest@vger.kernel.orgCc: stable@vger.kernel.orgLink:http://lkml.kernel.org/r/bc80338b453afa187bc5f895bd8e2c8d6e264da2.1521300271.git.luto@kernel.orgSigned-off-by: Ingo Molnar <mingo@kernel.org>

1 parentbb8c13d commit4b0b37dCopy full SHA for 4b0b37d

File tree

1 file changed

-2

lines changed

tools/testing/selftests/x86
- ptrace_syscall.c

1 file changed

-2

lines changed

`‎tools/testing/selftests/x86/ptrace_syscall.c‎`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -183,8 +183,10 @@ static void test_ptrace_syscall_restart(void)`
`183`	`183`	`if (ptrace(PTRACE_TRACEME,0,0,0)!=0)`
`184`	`184`	`err(1,"PTRACE_TRACEME");`
`185`	`185`
	`186`	`+pid_tpid=getpid(),tid=syscall(SYS_gettid);`
	`187`	`+`
`186`	`188`	`printf("\tChild will make one syscall\n");`
`187`		`-raise(SIGSTOP);`
	`189`	`+syscall(SYS_tgkill,pid,tid,SIGSTOP);`
`188`	`190`
`189`	`191`	`syscall(SYS_gettid,10,11,12,13,14,15);`
`190`	`192`	`_exit(0);`
`@@ -301,9 +303,11 @@ static void test_restart_under_ptrace(void)`
`301`	`303`	`if (ptrace(PTRACE_TRACEME,0,0,0)!=0)`
`302`	`304`	`err(1,"PTRACE_TRACEME");`
`303`	`305`
	`306`	`+pid_tpid=getpid(),tid=syscall(SYS_gettid);`
	`307`	`+`
`304`	`308`	`printf("\tChild will take a nap until signaled\n");`
`305`	`309`	`setsigign(SIGUSR1,SA_RESTART);`
`306`		`-raise(SIGSTOP);`
	`310`	`+syscall(SYS_tgkill,pid,tid,SIGSTOP);`
`307`	`311`
`308`	`312`	`syscall(SYS_pause,0,0,0,0,0,0);`
`309`	`313`	`_exit(0);`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit4b0b37d

File tree

1 file changed

1 file changed

`‎tools/testing/selftests/x86/ptrace_syscall.c‎`

0 commit comments