Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65e08c5e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux-kselftest-4.20-rc7' of... 

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
parents 76a5cfb8 2bd61abe

tools/testing/selftests/seccomp/seccomp_bpf.c

+7 −2
Original line number Original line Diff line number Diff line
@@ -2731,9 +2731,14 @@ TEST(syscall_restart) 
	ASSERT_EQ(child_pid, waitpid(child_pid, &status, 0));

	ASSERT_EQ(child_pid, waitpid(child_pid, &status, 0));

	ASSERT_EQ(true, WIFSTOPPED(status));

	ASSERT_EQ(true, WIFSTOPPED(status));

	ASSERT_EQ(SIGSTOP, WSTOPSIG(status));

	ASSERT_EQ(SIGSTOP, WSTOPSIG(status));

	/* Verify signal delivery came from parent now. */

	ASSERT_EQ(0, ptrace(PTRACE_GETSIGINFO, child_pid, NULL, &info));

	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. */

	/* Restart nanosleep with SIGCONT, which triggers restart_syscall. */

	ASSERT_EQ(0, kill(child_pid, SIGCONT));

	ASSERT_EQ(0, kill(child_pid, SIGCONT));