Module Name:    src
Committed By:   mgorny
Date:           Fri May 10 16:24:35 UTC 2019

Modified Files:
        src/tests/lib/libc/sys: t_ptrace_amd64_wait.h t_ptrace_i386_wait.h

Log Message:
Add tests for PT_SETREGS


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/tests/lib/libc/sys/t_ptrace_amd64_wait.h
cvs rdiff -u -r1.7 -r1.8 src/tests/lib/libc/sys/t_ptrace_i386_wait.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/lib/libc/sys/t_ptrace_amd64_wait.h
diff -u src/tests/lib/libc/sys/t_ptrace_amd64_wait.h:1.9 src/tests/lib/libc/sys/t_ptrace_amd64_wait.h:1.10
--- src/tests/lib/libc/sys/t_ptrace_amd64_wait.h:1.9	Mon May  6 00:08:13 2019
+++ src/tests/lib/libc/sys/t_ptrace_amd64_wait.h	Fri May 10 16:24:35 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_ptrace_amd64_wait.h,v 1.9 2019/05/06 00:08:13 christos Exp $	*/
+/*	$NetBSD: t_ptrace_amd64_wait.h,v 1.10 2019/05/10 16:24:35 mgorny Exp $	*/
 
 /*-
  * Copyright (c) 2016, 2017, 2018, 2019 The NetBSD Foundation, Inc.
@@ -198,6 +198,117 @@ ATF_TC_BODY(x86_64_regs_gp_read, tc)
 	TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
 }
 
+ATF_TC(x86_64_regs_gp_write);
+ATF_TC_HEAD(x86_64_regs_gp_write, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+		"Set general-purpose reg values into a debugged program via "
+		"PT_SETREGS and compare the result against expected.");
+}
+
+ATF_TC_BODY(x86_64_regs_gp_write, tc)
+{
+	const int exitval = 5;
+	pid_t child, wpid;
+#if defined(TWAIT_HAVE_STATUS)
+	const int sigval = SIGTRAP;
+	int status;
+#endif
+	struct reg gpr;
+
+	const uint64_t rax = 0x0001020304050607;
+	const uint64_t rbx = 0x1011121314151617;
+	const uint64_t rcx = 0x2021222324252627;
+	const uint64_t rdx = 0x3031323334353637;
+	const uint64_t rsi = 0x4041424344454647;
+	const uint64_t rdi = 0x5051525354555657;
+	const uint64_t rsp = 0x6061626364656667;
+	const uint64_t rbp = 0x7071727374757677;
+
+	DPRINTF("Before forking process PID=%d\n", getpid());
+	SYSCALL_REQUIRE((child = fork()) != -1);
+	if (child == 0) {
+		const uint64_t fill = 0x0F0F0F0F0F0F0F0F;
+		uint64_t v_rax, v_rbx, v_rcx, v_rdx, v_rsi, v_rdi, v_rsp, v_rbp;
+
+		DPRINTF("Before calling PT_TRACE_ME from child %d\n", getpid());
+		FORKEE_ASSERT(ptrace(PT_TRACE_ME, 0, NULL, 0) != -1);
+
+		DPRINTF("Before running assembly from child\n");
+
+		__asm__ __volatile__(
+			/* save rsp & rbp */
+			"movq    %%rsp, %4\n\t"
+			"movq    %%rbp, %5\n\t"
+			"\n\t"
+			/* fill registers with clobber pattern */
+			"movq    %8, %%rax\n\t"
+			"movq    %8, %%rbx\n\t"
+			"movq    %8, %%rcx\n\t"
+			"movq    %8, %%rdx\n\t"
+			"movq    %8, %%rsp\n\t"
+			"movq    %8, %%rbp\n\t"
+			"movq    %8, %%rsi\n\t"
+			"movq    %8, %%rdi\n\t"
+			"\n\t"
+			"int3\n\t"
+			"\n\t"
+			/* swap saved & current rsp & rbp */
+			"xchgq    %%rsp, %4\n\t"
+			"xchgq    %%rbp, %5\n\t"
+			: "=a"(v_rax), "=b"(v_rbx), "=c"(v_rcx), "=d"(v_rdx), "=r"(v_rsp),
+			"=r"(v_rbp), "=S"(v_rsi), "=D"(v_rdi)
+			: "g"(fill)
+			:
+		);
+
+		FORKEE_ASSERT_EQ(v_rax, rax);
+		FORKEE_ASSERT_EQ(v_rbx, rbx);
+		FORKEE_ASSERT_EQ(v_rcx, rcx);
+		FORKEE_ASSERT_EQ(v_rdx, rdx);
+		FORKEE_ASSERT_EQ(v_rsi, rsi);
+		FORKEE_ASSERT_EQ(v_rdi, rdi);
+		FORKEE_ASSERT_EQ(v_rsp, rsp);
+		FORKEE_ASSERT_EQ(v_rbp, rbp);
+
+		DPRINTF("Before exiting of the child process\n");
+		_exit(exitval);
+	}
+	DPRINTF("Parent process PID=%d, child's PID=%d\n", getpid(), child);
+
+	DPRINTF("Before calling %s() for the child\n", TWAIT_FNAME);
+	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child);
+
+	validate_status_stopped(status, sigval);
+
+	DPRINTF("Call GETREGS for the child process\n");
+	SYSCALL_REQUIRE(ptrace(PT_GETREGS, child, &gpr, 0) != -1);
+
+	gpr.regs[_REG_RAX] = rax;
+	gpr.regs[_REG_RBX] = rbx;
+	gpr.regs[_REG_RCX] = rcx;
+	gpr.regs[_REG_RDX] = rdx;
+	gpr.regs[_REG_RSI] = rsi;
+	gpr.regs[_REG_RDI] = rdi;
+	gpr.regs[_REG_RSP] = rsp;
+	gpr.regs[_REG_RBP] = rbp;
+
+	DPRINTF("Call SETREGS for the child process\n");
+	SYSCALL_REQUIRE(ptrace(PT_SETREGS, child, &gpr, 0) != -1);
+
+	DPRINTF("Before resuming the child process where it left off and "
+	    "without signal to be sent\n");
+	SYSCALL_REQUIRE(ptrace(PT_CONTINUE, child, (void *)1, 0) != -1);
+
+	DPRINTF("Before calling %s() for the child\n", TWAIT_FNAME);
+	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child);
+
+	validate_status_exited(status, exitval);
+
+	DPRINTF("Before calling %s() for the child\n", TWAIT_FNAME);
+	TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
+}
+
 ATF_TC(x86_64_regs_r8_read);
 ATF_TC_HEAD(x86_64_regs_r8_read, tc)
 {
@@ -285,13 +396,128 @@ ATF_TC_BODY(x86_64_regs_r8_read, tc)
 	TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
 }
 
+ATF_TC(x86_64_regs_r8_write);
+ATF_TC_HEAD(x86_64_regs_r8_write, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+		"Set r8..r15 reg values into a debugged program via "
+		"PT_SETREGS and compare the result against expected.");
+}
+
+ATF_TC_BODY(x86_64_regs_r8_write, tc)
+{
+	const int exitval = 5;
+	pid_t child, wpid;
+#if defined(TWAIT_HAVE_STATUS)
+	const int sigval = SIGTRAP;
+	int status;
+#endif
+	struct reg gpr;
+
+	const uint64_t r8[] = {
+		0x0001020304050607,
+		0x1011121314151617,
+		0x2021222324252627,
+		0x3031323334353637,
+		0x4041424344454647,
+		0x5051525354555657,
+		0x6061626364656667,
+		0x7071727374757677,
+	};
+
+	DPRINTF("Before forking process PID=%d\n", getpid());
+	SYSCALL_REQUIRE((child = fork()) != -1);
+	if (child == 0) {
+		const uint64_t fill = 0x0F0F0F0F0F0F0F0F;
+		uint64_t v_r8[8];
+
+		DPRINTF("Before calling PT_TRACE_ME from child %d\n", getpid());
+		FORKEE_ASSERT(ptrace(PT_TRACE_ME, 0, NULL, 0) != -1);
+
+		DPRINTF("Before running assembly from child\n");
+
+		__asm__ __volatile__(
+			/* fill registers with clobber pattern */
+			"movq    %1, %%r8\n\t"
+			"movq    %1, %%r9\n\t"
+			"movq    %1, %%r10\n\t"
+			"movq    %1, %%r11\n\t"
+			"movq    %1, %%r12\n\t"
+			"movq    %1, %%r13\n\t"
+			"movq    %1, %%r14\n\t"
+			"movq    %1, %%r15\n\t"
+			"\n\t"
+			"int3\n\t"
+			"\n\t"
+			"movq    %%r8, 0x00(%0)\n\t"
+			"movq    %%r9, 0x08(%0)\n\t"
+			"movq    %%r10, 0x10(%0)\n\t"
+			"movq    %%r11, 0x18(%0)\n\t"
+			"movq    %%r12, 0x20(%0)\n\t"
+			"movq    %%r13, 0x28(%0)\n\t"
+			"movq    %%r14, 0x30(%0)\n\t"
+			"movq    %%r15, 0x38(%0)\n\t"
+			:
+			: "a"(v_r8), "m"(fill)
+			: "%r8", "%r9", "%r10", "%r11", "%r12", "%r13", "%r14", "%r15"
+		);
+
+		FORKEE_ASSERT_EQ(v_r8[0], r8[0]);
+		FORKEE_ASSERT_EQ(v_r8[1], r8[1]);
+		FORKEE_ASSERT_EQ(v_r8[2], r8[2]);
+		FORKEE_ASSERT_EQ(v_r8[3], r8[3]);
+		FORKEE_ASSERT_EQ(v_r8[4], r8[4]);
+		FORKEE_ASSERT_EQ(v_r8[5], r8[5]);
+		FORKEE_ASSERT_EQ(v_r8[6], r8[6]);
+		FORKEE_ASSERT_EQ(v_r8[7], r8[7]);
+
+		DPRINTF("Before exiting of the child process\n");
+		_exit(exitval);
+	}
+	DPRINTF("Parent process PID=%d, child's PID=%d\n", getpid(), child);
+
+	DPRINTF("Before calling %s() for the child\n", TWAIT_FNAME);
+	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child);
+
+	validate_status_stopped(status, sigval);
+
+	DPRINTF("Call GETREGS for the child process\n");
+	SYSCALL_REQUIRE(ptrace(PT_GETREGS, child, &gpr, 0) != -1);
+
+	gpr.regs[_REG_R8] = r8[0];
+	gpr.regs[_REG_R9] = r8[1];
+	gpr.regs[_REG_R10] = r8[2];
+	gpr.regs[_REG_R11] = r8[3];
+	gpr.regs[_REG_R12] = r8[4];
+	gpr.regs[_REG_R13] = r8[5];
+	gpr.regs[_REG_R14] = r8[6];
+	gpr.regs[_REG_R15] = r8[7];
+
+	DPRINTF("Call SETREGS for the child process\n");
+	SYSCALL_REQUIRE(ptrace(PT_SETREGS, child, &gpr, 0) != -1);
+
+	DPRINTF("Before resuming the child process where it left off and "
+	    "without signal to be sent\n");
+	SYSCALL_REQUIRE(ptrace(PT_CONTINUE, child, (void *)1, 0) != -1);
+
+	DPRINTF("Before calling %s() for the child\n", TWAIT_FNAME);
+	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child);
+
+	validate_status_exited(status, exitval);
+
+	DPRINTF("Before calling %s() for the child\n", TWAIT_FNAME);
+	TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
+}
+
 /// ----------------------------------------------------------------------------
 
 
 #define ATF_TP_ADD_TCS_PTRACE_WAIT_AMD64() \
 	ATF_TP_ADD_TC_HAVE_GPREGS(tp, x86_64_regs1); \
 	ATF_TP_ADD_TC_HAVE_GPREGS(tp, x86_64_regs_gp_read); \
-	ATF_TP_ADD_TC_HAVE_GPREGS(tp, x86_64_regs_r8_read);
+	ATF_TP_ADD_TC_HAVE_GPREGS(tp, x86_64_regs_gp_write); \
+	ATF_TP_ADD_TC_HAVE_GPREGS(tp, x86_64_regs_r8_read); \
+	ATF_TP_ADD_TC_HAVE_GPREGS(tp, x86_64_regs_r8_write);
 #else
 #define ATF_TP_ADD_TCS_PTRACE_WAIT_AMD64()
 #endif

Index: src/tests/lib/libc/sys/t_ptrace_i386_wait.h
diff -u src/tests/lib/libc/sys/t_ptrace_i386_wait.h:1.7 src/tests/lib/libc/sys/t_ptrace_i386_wait.h:1.8
--- src/tests/lib/libc/sys/t_ptrace_i386_wait.h:1.7	Mon May  6 00:08:13 2019
+++ src/tests/lib/libc/sys/t_ptrace_i386_wait.h	Fri May 10 16:24:35 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_ptrace_i386_wait.h,v 1.7 2019/05/06 00:08:13 christos Exp $	*/
+/*	$NetBSD: t_ptrace_i386_wait.h,v 1.8 2019/05/10 16:24:35 mgorny Exp $	*/
 
 /*-
  * Copyright (c) 2016, 2017, 2018, 2019 The NetBSD Foundation, Inc.
@@ -174,6 +174,101 @@ ATF_TC_BODY(i386_regs_gp_read, tc)
 	TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
 }
 
+ATF_TC(i386_regs_gp_write);
+ATF_TC_HEAD(i386_regs_gp_write, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+		"Set general-purpose reg values into a debugged program via "
+		"PT_SETREGS and compare the result against expected.");
+}
+
+ATF_TC_BODY(i386_regs_gp_write, tc)
+{
+	const int exitval = 5;
+	pid_t child, wpid;
+#if defined(TWAIT_HAVE_STATUS)
+	const int sigval = SIGTRAP;
+	int status;
+#endif
+	struct reg gpr;
+
+	const uint32_t eax = 0x00010203;
+	const uint32_t ebx = 0x10111213;
+	const uint32_t ecx = 0x20212223;
+	const uint32_t edx = 0x30313233;
+	const uint32_t esi = 0x40414243;
+	const uint32_t edi = 0x50515253;
+
+	DPRINTF("Before forking process PID=%d\n", getpid());
+	SYSCALL_REQUIRE((child = fork()) != -1);
+	if (child == 0) {
+		const uint64_t fill = 0x0F0F0F0F;
+		uint32_t v_eax, v_ebx, v_ecx, v_edx, v_esi, v_edi;
+
+		DPRINTF("Before calling PT_TRACE_ME from child %d\n", getpid());
+		FORKEE_ASSERT(ptrace(PT_TRACE_ME, 0, NULL, 0) != -1);
+
+		DPRINTF("Before running assembly from child\n");
+
+		__asm__ __volatile__(
+			/* fill registers with clobber pattern */
+			"movl    %6, %%eax\n\t"
+			"movl    %6, %%ebx\n\t"
+			"movl    %6, %%ecx\n\t"
+			"movl    %6, %%edx\n\t"
+			"movl    %6, %%esi\n\t"
+			"movl    %6, %%edi\n\t"
+			"\n\t"
+			"int3\n\t"
+			: "=a"(v_eax), "=b"(v_ebx), "=c"(v_ecx), "=d"(v_edx), "=S"(v_esi),
+			"=D"(v_edi)
+			: "g"(fill)
+			:
+		);
+
+		FORKEE_ASSERT_EQ(v_eax, eax);
+		FORKEE_ASSERT_EQ(v_ebx, ebx);
+		FORKEE_ASSERT_EQ(v_ecx, ecx);
+		FORKEE_ASSERT_EQ(v_edx, edx);
+		FORKEE_ASSERT_EQ(v_esi, esi);
+		FORKEE_ASSERT_EQ(v_edi, edi);
+
+		DPRINTF("Before exiting of the child process\n");
+		_exit(exitval);
+	}
+	DPRINTF("Parent process PID=%d, child's PID=%d\n", getpid(), child);
+
+	DPRINTF("Before calling %s() for the child\n", TWAIT_FNAME);
+	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child);
+
+	validate_status_stopped(status, sigval);
+
+	DPRINTF("Call GETREGS for the child process\n");
+	SYSCALL_REQUIRE(ptrace(PT_GETREGS, child, &gpr, 0) != -1);
+
+	gpr.r_eax = eax;
+	gpr.r_ebx = ebx;
+	gpr.r_ecx = ecx;
+	gpr.r_edx = edx;
+	gpr.r_esi = esi;
+	gpr.r_edi = edi;
+
+	DPRINTF("Call SETREGS for the child process\n");
+	SYSCALL_REQUIRE(ptrace(PT_SETREGS, child, &gpr, 0) != -1);
+
+	DPRINTF("Before resuming the child process where it left off and "
+	    "without signal to be sent\n");
+	SYSCALL_REQUIRE(ptrace(PT_CONTINUE, child, (void *)1, 0) != -1);
+
+	DPRINTF("Before calling %s() for the child\n", TWAIT_FNAME);
+	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child);
+
+	validate_status_exited(status, exitval);
+
+	DPRINTF("Before calling %s() for the child\n", TWAIT_FNAME);
+	TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
+}
+
 ATF_TC(i386_regs_ebp_esp_read);
 ATF_TC_HEAD(i386_regs_ebp_esp_read, tc)
 {
@@ -248,10 +343,97 @@ ATF_TC_BODY(i386_regs_ebp_esp_read, tc)
 	TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
 }
 
+ATF_TC(i386_regs_ebp_esp_write);
+ATF_TC_HEAD(i386_regs_ebp_esp_write, tc)
+{
+	atf_tc_set_md_var(tc, "descr",
+		"Set EBP & ESP reg values into a debugged program via "
+		"PT_SETREGS and compare the result against expected.");
+}
+
+ATF_TC_BODY(i386_regs_ebp_esp_write, tc)
+{
+	const int exitval = 5;
+	pid_t child, wpid;
+#if defined(TWAIT_HAVE_STATUS)
+	const int sigval = SIGTRAP;
+	int status;
+#endif
+	struct reg gpr;
+
+	const uint32_t esp = 0x60616263;
+	const uint32_t ebp = 0x70717273;
+
+	DPRINTF("Before forking process PID=%d\n", getpid());
+	SYSCALL_REQUIRE((child = fork()) != -1);
+	if (child == 0) {
+		const uint64_t fill = 0x0F0F0F0F;
+		uint32_t v_esp, v_ebp;
+
+		DPRINTF("Before calling PT_TRACE_ME from child %d\n", getpid());
+		FORKEE_ASSERT(ptrace(PT_TRACE_ME, 0, NULL, 0) != -1);
+
+		DPRINTF("Before running assembly from child\n");
+
+		__asm__ __volatile__(
+			/* save original ebp & esp using our output registers */
+			"movl    %%esp, %0\n\t"
+			"movl    %%ebp, %1\n\t"
+			/* fill them with clobber pattern */
+			"movl    %2, %%esp\n\t"
+			"movl    %2, %%ebp\n\t"
+			"\n\t"
+			"int3\n\t"
+			"\n\t"
+			/* restore ebp & esp, and save the result */
+			"xchgl   %%esp, %0\n\t"
+			"xchgl   %%ebp, %1\n\t"
+			: "=r"(v_esp), "=r"(v_ebp)
+			: "g"(fill)
+			:
+		);
+
+		FORKEE_ASSERT_EQ(v_esp, esp);
+		FORKEE_ASSERT_EQ(v_ebp, ebp);
+
+		DPRINTF("Before exiting of the child process\n");
+		_exit(exitval);
+	}
+	DPRINTF("Parent process PID=%d, child's PID=%d\n", getpid(), child);
+
+	DPRINTF("Before calling %s() for the child\n", TWAIT_FNAME);
+	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child);
+
+	validate_status_stopped(status, sigval);
+
+	DPRINTF("Call GETREGS for the child process\n");
+	SYSCALL_REQUIRE(ptrace(PT_GETREGS, child, &gpr, 0) != -1);
+
+	gpr.r_esp = esp;
+	gpr.r_ebp = ebp;
+
+	DPRINTF("Call SETREGS for the child process\n");
+	SYSCALL_REQUIRE(ptrace(PT_SETREGS, child, &gpr, 0) != -1);
+
+	DPRINTF("Before resuming the child process where it left off and "
+	    "without signal to be sent\n");
+	SYSCALL_REQUIRE(ptrace(PT_CONTINUE, child, (void *)1, 0) != -1);
+
+	DPRINTF("Before calling %s() for the child\n", TWAIT_FNAME);
+	TWAIT_REQUIRE_SUCCESS(wpid = TWAIT_GENERIC(child, &status, 0), child);
+
+	validate_status_exited(status, exitval);
+
+	DPRINTF("Before calling %s() for the child\n", TWAIT_FNAME);
+	TWAIT_REQUIRE_FAILURE(ECHILD, wpid = TWAIT_GENERIC(child, &status, 0));
+}
+
 #define ATF_TP_ADD_TCS_PTRACE_WAIT_I386() \
 	ATF_TP_ADD_TC_HAVE_GPREGS(tp, i386_regs1); \
 	ATF_TP_ADD_TC_HAVE_GPREGS(tp, i386_regs_gp_read); \
-	ATF_TP_ADD_TC_HAVE_GPREGS(tp, i386_regs_ebp_esp_read);
+	ATF_TP_ADD_TC_HAVE_GPREGS(tp, i386_regs_gp_write); \
+	ATF_TP_ADD_TC_HAVE_GPREGS(tp, i386_regs_ebp_esp_read); \
+	ATF_TP_ADD_TC_HAVE_GPREGS(tp, i386_regs_ebp_esp_write);
 #else
 #define ATF_TP_ADD_TCS_PTRACE_WAIT_I386()
 #endif

Reply via email to