Module Name: src Committed By: kamil Date: Fri Jan 6 22:40:06 UTC 2017
Modified Files: src/tests/kernel: t_ptrace_wait.c Log Message: Add new test siginfo4 in t_ptrace_wait{,3,4,6,id,pid} siginfo4: Detect SIGTRAP TRAP_EXEC from tracee This test is currently disabled and it will be enabled once PT_[SG]ET_SIGINFO will land the sources. Sponsored by <The NetBSD Foundation> To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/tests/kernel/t_ptrace_wait.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/tests/kernel/t_ptrace_wait.c diff -u src/tests/kernel/t_ptrace_wait.c:1.49 src/tests/kernel/t_ptrace_wait.c:1.50 --- src/tests/kernel/t_ptrace_wait.c:1.49 Wed Jan 4 22:27:20 2017 +++ src/tests/kernel/t_ptrace_wait.c Fri Jan 6 22:40:06 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: t_ptrace_wait.c,v 1.49 2017/01/04 22:27:20 kamil Exp $ */ +/* $NetBSD: t_ptrace_wait.c,v 1.50 2017/01/06 22:40:06 kamil Exp $ */ /*- * Copyright (c) 2016 The NetBSD Foundation, Inc. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__RCSID("$NetBSD: t_ptrace_wait.c,v 1.49 2017/01/04 22:27:20 kamil Exp $"); +__RCSID("$NetBSD: t_ptrace_wait.c,v 1.50 2017/01/06 22:40:06 kamil Exp $"); #include <sys/param.h> #include <sys/types.h> @@ -4701,6 +4701,66 @@ ATF_TC_BODY(siginfo3, tc) } #endif +#if defined(HAVE_SIGINFO) +ATF_TC(siginfo4); +ATF_TC_HEAD(siginfo4, tc) +{ + atf_tc_set_md_var(tc, "descr", + "Detect SIGTRAP TRAP_EXEC from tracee"); +} + +ATF_TC_BODY(siginfo4, tc) +{ + const int sigval = SIGTRAP; + pid_t child, wpid; +#if defined(TWAIT_HAVE_STATUS) + int status; +#endif + + struct ptrace_siginfo info; + memset(&info, 0, sizeof(info)); + + printf("Before forking process PID=%d\n", getpid()); + ATF_REQUIRE((child = fork()) != -1); + if (child == 0) { + printf("Before calling PT_TRACE_ME from child %d\n", getpid()); + FORKEE_ASSERT(ptrace(PT_TRACE_ME, 0, NULL, 0) != -1); + + printf("Before calling execve(2) from child\n"); + execlp("/bin/echo", "/bin/echo", NULL); + + FORKEE_ASSERT(0 && "Not reached"); + } + printf("Parent process PID=%d, child's PID=%d\n", getpid(), child); + + printf("Before calling %s() for the child\n", TWAIT_FNAME); + TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child); + + validate_status_stopped(status, sigval); + + printf("Before calling ptrace(2) with PT_GET_SIGINFO for child\n"); + ATF_REQUIRE(ptrace(PT_GET_SIGINFO, child, &info, sizeof(info)) != -1); + + printf("Signal traced to lwpid=%d\n", info.psi_lwpid); + printf("Signal properties: si_signo=%#x si_code=%#x si_errno=%#x\n", + info.psi_siginfo.si_signo, info.psi_siginfo.si_code, + info.psi_siginfo.si_errno); + + ATF_REQUIRE_EQ(info.psi_siginfo.si_signo, sigval); + ATF_REQUIRE_EQ(info.psi_siginfo.si_code, TRAP_EXEC); + + printf("Before resuming the child process where it left off and " + "without signal to be sent\n"); + ATF_REQUIRE(ptrace(PT_CONTINUE, child, (void *)1, 0) != -1); + + printf("Before calling %s() for the child\n", TWAIT_FNAME); + TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child); + + printf("Before calling %s() for the child\n", TWAIT_FNAME); + TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0)); +} +#endif + ATF_TP_ADD_TCS(tp) { setvbuf(stdout, NULL, _IONBF, 0); @@ -4786,6 +4846,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC_HAVE_SIGINFO(tp, siginfo1); ATF_TP_ADD_TC_HAVE_SIGINFO(tp, siginfo2); ATF_TP_ADD_TC_HAVE_SIGINFO(tp, siginfo3); + ATF_TP_ADD_TC_HAVE_SIGINFO(tp, siginfo4); return atf_no_error(); }