Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+7
-2
+7
-2
tools/testing/selftests/seccomp/seccomp_bpf.c
+7
-2
tools/testing/selftests/seccomp/seccomp_bpf.c
···
2731
2731
ASSERT_EQ(child_pid, waitpid(child_pid, &status, 0));
2732
2732
ASSERT_EQ(true, WIFSTOPPED(status));
2733
2733
ASSERT_EQ(SIGSTOP, WSTOPSIG(status));
2734
-
/* Verify signal delivery came from parent now. */
2735
2734
ASSERT_EQ(0, ptrace(PTRACE_GETSIGINFO, child_pid, NULL, &info));
2736
-
EXPECT_EQ(getpid(), info.si_pid);
2735
+
/*
2736
+
* There is no siginfo on SIGSTOP any more, so we can't verify
2737
+
* signal delivery came from parent now (getpid() == info.si_pid).
2738
+
* https://lkml.kernel.org/r/CAGXu5jJaZAOzP1qFz66tYrtbuywqb+UN2SOA1VLHpCCOiYvYeg@mail.gmail.com
2739
+
* At least verify the SIGSTOP via PTRACE_GETSIGINFO.
2740
+
*/
2741
+
EXPECT_EQ(SIGSTOP, info.si_signo);
2737
2742
2738
2743
/* Restart nanosleep with SIGCONT, which triggers restart_syscall. */
2739
2744
ASSERT_EQ(0, kill(child_pid, SIGCONT));