Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/tests/kernel/arch/x86 Refactor dbregs_dr*_dont_inherit_execv...
details: https://anonhg.NetBSD.org/src/rev/c805e1e8d004
branches: trunk
changeset: 822704:c805e1e8d004
user: kamil <kamil%NetBSD.org@localhost>
date: Sat Apr 01 23:25:08 2017 +0000
description:
Refactor dbregs_dr*_dont_inherit_execve ATF tests for x86/
Eliminate duplicated code.
Sponsored by <The NetBSD Foundation>
diffstat:
tests/kernel/arch/x86/t_ptrace_wait.c | 573 ++-------------------------------
1 files changed, 47 insertions(+), 526 deletions(-)
diffs (truncated from 625 to 300 lines):
diff -r 4002e7b652ac -r c805e1e8d004 tests/kernel/arch/x86/t_ptrace_wait.c
--- a/tests/kernel/arch/x86/t_ptrace_wait.c Sat Apr 01 20:14:53 2017 +0000
+++ b/tests/kernel/arch/x86/t_ptrace_wait.c Sat Apr 01 23:25:08 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ptrace_wait.c,v 1.6 2017/03/30 20:24:35 kamil Exp $ */
+/* $NetBSD: t_ptrace_wait.c,v 1.7 2017/04/01 23:25:08 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.6 2017/03/30 20:24:35 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.7 2017/04/01 23:25:08 kamil Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -1798,16 +1798,8 @@
dbregs_dont_inherit_lwp(3);
}
-#if defined(HAVE_DBREGS)
-ATF_TC(dbregs_dr0_dont_inherit_execve);
-ATF_TC_HEAD(dbregs_dr0_dont_inherit_execve, tc)
-{
- atf_tc_set_md_var(tc, "descr",
- "Verify that execve(2) is intercepted by tracer and Debug "
- "Register 0 is reset");
-}
-
-ATF_TC_BODY(dbregs_dr0_dont_inherit_execve, tc)
+static void
+dbregs_dont_inherit_execve(int reg)
{
const int sigval = SIGTRAP;
pid_t child, wpid;
@@ -1849,217 +1841,9 @@
for (i = 0; i < __arraycount(r1.dr); i++)
printf("r1[%zu]=%" PRIxREGISTER "\n", i, r1.dr[i]);
- r1.dr[0] = (long)(intptr_t)check_happy;
- printf("Set DR0 (r1.dr[0]) to new value %" PRIxREGISTER "\n",
- r1.dr[0]);
-
- printf("New state of the debug registers (r1):\n");
- for (i = 0; i < __arraycount(r1.dr); i++)
- printf("r1[%zu]=%" PRIxREGISTER "\n", i, r1.dr[i]);
-
- printf("Call SETDBREGS for the child process (r1)\n");
- ATF_REQUIRE(ptrace(PT_SETDBREGS, child, &r1, 0) != -1);
-
- 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);
-
- 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("Call GETDBREGS for the child process after execve(2)\n");
- ATF_REQUIRE(ptrace(PT_GETDBREGS, child, &r2, 0) != -1);
-
- printf("State of the debug registers (r2):\n");
- for (i = 0; i < __arraycount(r2.dr); i++)
- printf("r2[%zu]=%" PRIxREGISTER "\n", i, r2.dr[i]);
-
- printf("Assert that (r1) and (r2) are not the same\n");
- ATF_REQUIRE(memcmp(&r1, &r2, sizeof(r1)) != 0);
-
- 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
-
-#if defined(HAVE_DBREGS)
-ATF_TC(dbregs_dr1_dont_inherit_execve);
-ATF_TC_HEAD(dbregs_dr1_dont_inherit_execve, tc)
-{
- atf_tc_set_md_var(tc, "descr",
- "Verify that execve(2) is intercepted by tracer and Debug "
- "Register 1 is reset");
-}
-
-ATF_TC_BODY(dbregs_dr1_dont_inherit_execve, tc)
-{
- const int sigval = SIGTRAP;
- pid_t child, wpid;
-#if defined(TWAIT_HAVE_STATUS)
- int status;
-#endif
- size_t i;
- struct dbreg r1;
- struct dbreg r2;
-
- 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 raising %s from child\n", strsignal(sigval));
- FORKEE_ASSERT(raise(sigval) == 0);
-
- 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("Call GETDBREGS for the child process (r1)\n");
- ATF_REQUIRE(ptrace(PT_GETDBREGS, child, &r1, 0) != -1);
-
- printf("State of the debug registers (r1):\n");
- for (i = 0; i < __arraycount(r1.dr); i++)
- printf("r1[%zu]=%" PRIxREGISTER "\n", i, r1.dr[i]);
-
- r1.dr[1] = (long)(intptr_t)check_happy;
- printf("Set DR1 (r1.dr[1]) to new value %" PRIxREGISTER "\n",
- r1.dr[1]);
-
- printf("New state of the debug registers (r1):\n");
- for (i = 0; i < __arraycount(r1.dr); i++)
- printf("r1[%zu]=%" PRIxREGISTER "\n", i, r1.dr[i]);
-
- printf("Call SETDBREGS for the child process (r1)\n");
- ATF_REQUIRE(ptrace(PT_SETDBREGS, child, &r1, 0) != -1);
-
- 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);
-
- 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("Call GETDBREGS for the child process after execve(2)\n");
- ATF_REQUIRE(ptrace(PT_GETDBREGS, child, &r2, 0) != -1);
-
- printf("State of the debug registers (r2):\n");
- for (i = 0; i < __arraycount(r2.dr); i++)
- printf("r2[%zu]=%" PRIxREGISTER "\n", i, r2.dr[i]);
-
- printf("Assert that (r1) and (r2) are not the same\n");
- ATF_REQUIRE(memcmp(&r1, &r2, sizeof(r1)) != 0);
-
- 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
-
-#if defined(HAVE_DBREGS)
-ATF_TC(dbregs_dr2_dont_inherit_execve);
-ATF_TC_HEAD(dbregs_dr2_dont_inherit_execve, tc)
-{
- atf_tc_set_md_var(tc, "descr",
- "Verify that execve(2) is intercepted by tracer and Debug "
- "Register 2 is reset");
-}
-
-ATF_TC_BODY(dbregs_dr2_dont_inherit_execve, tc)
-{
- const int sigval = SIGTRAP;
- pid_t child, wpid;
-#if defined(TWAIT_HAVE_STATUS)
- int status;
-#endif
- size_t i;
- struct dbreg r1;
- struct dbreg r2;
-
- 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 raising %s from child\n", strsignal(sigval));
- FORKEE_ASSERT(raise(sigval) == 0);
-
- 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("Call GETDBREGS for the child process (r1)\n");
- ATF_REQUIRE(ptrace(PT_GETDBREGS, child, &r1, 0) != -1);
-
- printf("State of the debug registers (r1):\n");
- for (i = 0; i < __arraycount(r1.dr); i++)
- printf("r1[%zu]=%" PRIxREGISTER "\n", i, r1.dr[i]);
-
- r1.dr[2] = (long)(intptr_t)check_happy;
- printf("Set DR2 (r1.dr[2]) to new value %" PRIxREGISTER "\n",
- r1.dr[2]);
+ r1.dr[reg] = (long)(intptr_t)check_happy;
+ printf("Set DR%d (r1.dr[%d]) to new value %" PRIxREGISTER "\n",
+ reg, reg, r1.dr[reg]);
printf("New state of the debug registers (r1):\n");
for (i = 0; i < __arraycount(r1.dr); i++)
@@ -2108,9 +1892,46 @@
printf("Before calling %s() for the child\n", TWAIT_FNAME);
TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
}
-#endif
+
+ATF_TC(dbregs_dr0_dont_inherit_execve);
+ATF_TC_HEAD(dbregs_dr0_dont_inherit_execve, tc)
+{
+ atf_tc_set_md_var(tc, "descr",
+ "Verify that execve(2) is intercepted by tracer and Debug "
+ "Register 0 is reset");
+}
+
+ATF_TC_BODY(dbregs_dr0_dont_inherit_execve, tc)
+{
+ dbregs_dont_inherit_execve(0);
+}
-#if defined(HAVE_DBREGS)
+ATF_TC(dbregs_dr1_dont_inherit_execve);
+ATF_TC_HEAD(dbregs_dr1_dont_inherit_execve, tc)
+{
+ atf_tc_set_md_var(tc, "descr",
+ "Verify that execve(2) is intercepted by tracer and Debug "
+ "Register 1 is reset");
+}
+
+ATF_TC_BODY(dbregs_dr1_dont_inherit_execve, tc)
+{
+ dbregs_dont_inherit_execve(1);
+}
+
+ATF_TC(dbregs_dr2_dont_inherit_execve);
+ATF_TC_HEAD(dbregs_dr2_dont_inherit_execve, tc)
+{
+ atf_tc_set_md_var(tc, "descr",
+ "Verify that execve(2) is intercepted by tracer and Debug "
+ "Register 2 is reset");
+}
+
+ATF_TC_BODY(dbregs_dr2_dont_inherit_execve, tc)
Home |
Main Index |
Thread Index |
Old Index