diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-13 12:57:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-13 12:57:21 -0800 |
| commit | 65e08c5e86311143f45c3e4389561af3107fc8f6 (patch) | |
| tree | c9001fc4554e1568457449bca6b6424a7ea577d5 /tools | |
| parent | 76a5cfb8e7c98ae0ea238910f97c17cb1f638918 (diff) | |
| parent | 2bd61abead58c82714a1f6fa6beb0fd0df6a6d13 (diff) | |
| download | linux-65e08c5e86311143f45c3e4389561af3107fc8f6.tar.gz linux-65e08c5e86311143f45c3e4389561af3107fc8f6.tar.bz2 linux-65e08c5e86311143f45c3e4389561af3107fc8f6.zip | |
Merge tag 'linux-kselftest-4.20-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
Pull Kselftest fix from Shuah Khan:
"A single fix for a seccomp test from Kees Cook."
* tag 'linux-kselftest-4.20-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
selftests/seccomp: Remove SIGSTOP si_pid check
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/testing/selftests/seccomp/seccomp_bpf.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tools/testing/selftests/seccomp/seccomp_bpf.c b/tools/testing/selftests/seccomp/seccomp_bpf.c index e1473234968d..c9a2abf8be1b 100644 --- a/tools/testing/selftests/seccomp/seccomp_bpf.c +++ b/tools/testing/selftests/seccomp/seccomp_bpf.c @@ -2731,9 +2731,14 @@ TEST(syscall_restart) ASSERT_EQ(child_pid, waitpid(child_pid, &status, 0)); ASSERT_EQ(true, WIFSTOPPED(status)); ASSERT_EQ(SIGSTOP, WSTOPSIG(status)); - /* Verify signal delivery came from parent now. */ ASSERT_EQ(0, ptrace(PTRACE_GETSIGINFO, child_pid, NULL, &info)); - EXPECT_EQ(getpid(), info.si_pid); + /* + * There is no siginfo on SIGSTOP any more, so we can't verify + * signal delivery came from parent now (getpid() == info.si_pid). + * https://lkml.kernel.org/r/CAGXu5jJaZAOzP1qFz66tYrtbuywqb+UN2SOA1VLHpCCOiYvYeg@mail.gmail.com + * At least verify the SIGSTOP via PTRACE_GETSIGINFO. + */ + EXPECT_EQ(SIGSTOP, info.si_signo); /* Restart nanosleep with SIGCONT, which triggers restart_syscall. */ ASSERT_EQ(0, kill(child_pid, SIGCONT)); |