diff mbox series

[GIT,PULL] kselftest update for Linux 4.20-rc7

Message ID fe1c6815-c338-e264-cd77-7d92457acf4c@kernel.org (mailing list archive)
State Accepted
Commit 2bd61abead58c82714a1f6fa6beb0fd0df6a6d13
Headers show
Series [GIT,PULL] kselftest update for Linux 4.20-rc7 | expand

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Commit Message

Shuah Dec. 13, 2018, 8:37 p.m. UTC 
Hi Linus,

Please pull the following Kselftest update for Linux 4.20-rc7.

This Kselftest update for Linux 4.20-rc7 consists of a single fix for
seccomp test from Kees Cook.

diff is attached.

thanks,
-- Shuah

----------------------------------------------------------------
The following changes since commit 651022382c7f8da46cb4872a545ee1da6d097d2a:

   Linux 4.20-rc1 (2018-11-04 15:37:52 -0800)

are available in the Git repository at:

   git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest 
tags/linux-kselftest-4.20-rc7

for you to fetch changes up to 2bd61abead58c82714a1f6fa6beb0fd0df6a6d13:

   selftests/seccomp: Remove SIGSTOP si_pid check (2018-12-11 17:57:30 
-0700)

----------------------------------------------------------------
linux-kselftest-4.20-rc7

This Kselftest update for Linux 4.20-rc7 consists of a single fix for
seccomp test from Kees Cook.

----------------------------------------------------------------
Kees Cook (1):
       selftests/seccomp: Remove SIGSTOP si_pid check

  tools/testing/selftests/seccomp/seccomp_bpf.c | 9 +++++++--
  1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------

Comments

pr-tracker-bot@kernel.org Dec. 13, 2018, 9:15 p.m. UTC | #1 
The pull request you sent on Thu, 13 Dec 2018 13:37:08 -0700:

> git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux-kselftest-4.20-rc7

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/65e08c5e86311143f45c3e4389561af3107fc8f6

Thank you!
diff mbox series

Patch

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));