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

Commit 2bd61abe authored by Kees Cook's avatar Kees Cook Committed by Shuah Khan
Browse files

selftests/seccomp: Remove SIGSTOP si_pid check 

Commit f149b315 ("signal: Never allocate siginfo for SIGKILL or SIGSTOP")
means that the seccomp selftest cannot check si_pid under SIGSTOP anymore.
Since it's believed[1] there are no other userspace things depending on the
old behavior, this removes the behavioral check in the selftest, since it's
more a "extra" sanity check (which turns out, maybe, not to have been
useful to test).

[1] https://lkml.kernel.org/r/CAGXu5jJaZAOzP1qFz66tYrtbuywqb+UN2SOA1VLHpCCOiYvYeg@mail.gmail.com



Reported-by: default avatarTycho Andersen <tycho@tycho.ws>
Suggested-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarShuah Khan <shuah@kernel.org>
parent 65102238

tools/testing/selftests/seccomp/seccomp_bpf.c

+7 −2
Original line number Diff line number Diff line
@@ -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));