|
 |
87fefba |
commit 3967a99c26e8b314634a6b1fd8927cbb2bb5d060
|
|
|
87fefba |
Author: Mark Wielaard <mark@klomp.org>
|
|
|
87fefba |
Date: Wed Dec 12 14:11:29 2018 +0100
|
|
|
87fefba |
|
|
|
87fefba |
Implement minimal ptrace support for ppc64[le]-linux.
|
|
|
87fefba |
|
|
|
87fefba |
diff --git a/coregrind/m_syswrap/syswrap-ppc64-linux.c b/coregrind/m_syswrap/syswrap-ppc64-linux.c
|
|
|
87fefba |
index 6549dd1..0fdcc8e 100644
|
|
|
87fefba |
--- a/coregrind/m_syswrap/syswrap-ppc64-linux.c
|
|
|
87fefba |
+++ b/coregrind/m_syswrap/syswrap-ppc64-linux.c
|
|
|
87fefba |
@@ -388,6 +388,7 @@ DECL_TEMPLATE(ppc64_linux, sys_mmap);
|
|
|
87fefba |
//zz DECL_TEMPLATE(ppc64_linux, sys_sigreturn);
|
|
|
87fefba |
DECL_TEMPLATE(ppc64_linux, sys_rt_sigreturn);
|
|
|
87fefba |
DECL_TEMPLATE(ppc64_linux, sys_fadvise64);
|
|
|
87fefba |
+DECL_TEMPLATE(ppc64_linux, sys_ptrace);
|
|
|
87fefba |
|
|
|
87fefba |
PRE(sys_mmap)
|
|
|
87fefba |
{
|
|
|
87fefba |
@@ -511,6 +512,72 @@ PRE(sys_rt_sigreturn)
|
|
|
87fefba |
*flags |= SfPollAfter;
|
|
|
87fefba |
}
|
|
|
87fefba |
|
|
|
87fefba |
+// ARG3 is only used for pointers into the traced process's address
|
|
|
87fefba |
+// space and for offsets into the traced process's struct
|
|
|
87fefba |
+// user_regs_struct. It is never a pointer into this process's memory
|
|
|
87fefba |
+// space, and we should therefore not check anything it points to.
|
|
|
87fefba |
+// powerpc does have other ways to get/set registers, we only support
|
|
|
87fefba |
+// GET/SETREGSET for now.
|
|
|
87fefba |
+PRE(sys_ptrace)
|
|
|
87fefba |
+{
|
|
|
87fefba |
+ PRINT("sys_ptrace ( %ld, %ld, %#lx, %#lx )", ARG1,ARG2,ARG3,ARG4);
|
|
|
87fefba |
+ PRE_REG_READ4(int, "ptrace",
|
|
|
87fefba |
+ long, request, long, pid, long, addr, long, data);
|
|
|
87fefba |
+ switch (ARG1) {
|
|
|
87fefba |
+ case VKI_PTRACE_PEEKTEXT:
|
|
|
87fefba |
+ case VKI_PTRACE_PEEKDATA:
|
|
|
87fefba |
+ case VKI_PTRACE_PEEKUSR:
|
|
|
87fefba |
+ PRE_MEM_WRITE( "ptrace(peek)", ARG4,
|
|
|
87fefba |
+ sizeof (long));
|
|
|
87fefba |
+ break;
|
|
|
87fefba |
+ case VKI_PTRACE_GETEVENTMSG:
|
|
|
87fefba |
+ PRE_MEM_WRITE( "ptrace(geteventmsg)", ARG4, sizeof(unsigned long));
|
|
|
87fefba |
+ break;
|
|
|
87fefba |
+ case VKI_PTRACE_GETSIGINFO:
|
|
|
87fefba |
+ PRE_MEM_WRITE( "ptrace(getsiginfo)", ARG4, sizeof(vki_siginfo_t));
|
|
|
87fefba |
+ break;
|
|
|
87fefba |
+ case VKI_PTRACE_SETSIGINFO:
|
|
|
87fefba |
+ PRE_MEM_READ( "ptrace(setsiginfo)", ARG4, sizeof(vki_siginfo_t));
|
|
|
87fefba |
+ break;
|
|
|
87fefba |
+ case VKI_PTRACE_GETREGSET:
|
|
|
87fefba |
+ ML_(linux_PRE_getregset)(tid, ARG3, ARG4);
|
|
|
87fefba |
+ break;
|
|
|
87fefba |
+ case VKI_PTRACE_SETREGSET:
|
|
|
87fefba |
+ ML_(linux_PRE_setregset)(tid, ARG3, ARG4);
|
|
|
87fefba |
+ break;
|
|
|
87fefba |
+ default:
|
|
|
87fefba |
+ break;
|
|
|
87fefba |
+ }
|
|
|
87fefba |
+}
|
|
|
87fefba |
+
|
|
|
87fefba |
+POST(sys_ptrace)
|
|
|
87fefba |
+{
|
|
|
87fefba |
+ switch (ARG1) {
|
|
|
87fefba |
+ case VKI_PTRACE_TRACEME:
|
|
|
87fefba |
+ ML_(linux_POST_traceme)(tid);
|
|
|
87fefba |
+ break;
|
|
|
87fefba |
+ case VKI_PTRACE_PEEKTEXT:
|
|
|
87fefba |
+ case VKI_PTRACE_PEEKDATA:
|
|
|
87fefba |
+ case VKI_PTRACE_PEEKUSR:
|
|
|
87fefba |
+ POST_MEM_WRITE( ARG4, sizeof (long));
|
|
|
87fefba |
+ break;
|
|
|
87fefba |
+ case VKI_PTRACE_GETEVENTMSG:
|
|
|
87fefba |
+ POST_MEM_WRITE( ARG4, sizeof(unsigned long));
|
|
|
87fefba |
+ break;
|
|
|
87fefba |
+ case VKI_PTRACE_GETSIGINFO:
|
|
|
87fefba |
+ /* XXX: This is a simplification. Different parts of the
|
|
|
87fefba |
+ * siginfo_t are valid depending on the type of signal.
|
|
|
87fefba |
+ */
|
|
|
87fefba |
+ POST_MEM_WRITE( ARG4, sizeof(vki_siginfo_t));
|
|
|
87fefba |
+ break;
|
|
|
87fefba |
+ case VKI_PTRACE_GETREGSET:
|
|
|
87fefba |
+ ML_(linux_POST_getregset)(tid, ARG3, ARG4);
|
|
|
87fefba |
+ break;
|
|
|
87fefba |
+ default:
|
|
|
87fefba |
+ break;
|
|
|
87fefba |
+ }
|
|
|
87fefba |
+}
|
|
|
87fefba |
+
|
|
|
87fefba |
#undef PRE
|
|
|
87fefba |
#undef POST
|
|
|
87fefba |
|
|
|
87fefba |
@@ -562,8 +629,7 @@ static SyscallTableEntry syscall_table[] = {
|
|
|
87fefba |
GENX_(__NR_getuid, sys_getuid), // 24
|
|
|
87fefba |
|
|
|
87fefba |
// _____(__NR_stime, sys_stime), // 25
|
|
|
87fefba |
-// When ptrace is supported, memcheck/tests/linux/getregset should be enabled
|
|
|
87fefba |
-// _____(__NR_ptrace, sys_ptrace), // 26
|
|
|
87fefba |
+ PLAXY(__NR_ptrace, sys_ptrace), // 26
|
|
|
87fefba |
GENX_(__NR_alarm, sys_alarm), // 27
|
|
|
87fefba |
// _____(__NR_oldfstat, sys_oldfstat), // 28
|
|
|
87fefba |
GENX_(__NR_pause, sys_pause), // 29
|
|
|
87fefba |
diff --git a/memcheck/tests/linux/getregset.vgtest b/memcheck/tests/linux/getregset.vgtest
|
|
|
87fefba |
index 4c66108..c35be4c 100644
|
|
|
87fefba |
--- a/memcheck/tests/linux/getregset.vgtest
|
|
|
87fefba |
+++ b/memcheck/tests/linux/getregset.vgtest
|
|
|
87fefba |
@@ -1,4 +1,4 @@
|
|
|
87fefba |
prog: getregset
|
|
|
87fefba |
vgopts: -q
|
|
|
87fefba |
-prereq: ((../../../tests/os_test linux 2.6.33 && ! ../../../tests/arch_test mips32) || ../../../tests/os_test linux 3.10.0 ) && ! ../../../tests/arch_test ppc64
|
|
|
87fefba |
+prereq: ((../../../tests/os_test linux 2.6.33 && ! ../../../tests/arch_test mips32) || ../../../tests/os_test linux 3.10.0 )
|
|
|
87fefba |
|