|
 |
1c194f |
commit 122225d7ed260f6bd9de4472e5260ec768ce972d
|
|
|
1c194f |
Author: Mark Wielaard <mark@klomp.org>
|
|
|
1c194f |
Date: Tue Jun 19 18:26:43 2018 +0200
|
|
|
1c194f |
|
|
|
1c194f |
Implement ptrace syscall wrapper for arm64-linux.
|
|
|
1c194f |
|
|
|
1c194f |
With this valgrind is able to run gdb on arm64.
|
|
|
1c194f |
Also fixes the memcheck/tests/linux/getregset testcase.
|
|
|
1c194f |
|
|
|
1c194f |
https://bugs.kde.org/show_bug.cgi?id=368913
|
|
|
1c194f |
|
|
|
1c194f |
diff --git a/coregrind/m_syswrap/syswrap-arm64-linux.c b/coregrind/m_syswrap/syswrap-arm64-linux.c
|
|
|
1c194f |
index 32b87bf..24a6493 100644
|
|
|
1c194f |
--- a/coregrind/m_syswrap/syswrap-arm64-linux.c
|
|
|
1c194f |
+++ b/coregrind/m_syswrap/syswrap-arm64-linux.c
|
|
|
1c194f |
@@ -265,7 +265,7 @@ DECL_TEMPLATE(arm64_linux, sys_rt_sigreturn);
|
|
|
1c194f |
//ZZ DECL_TEMPLATE(arm_linux, sys_sigsuspend);
|
|
|
1c194f |
//ZZ DECL_TEMPLATE(arm_linux, sys_set_tls);
|
|
|
1c194f |
//ZZ DECL_TEMPLATE(arm_linux, sys_cacheflush);
|
|
|
1c194f |
-//ZZ DECL_TEMPLATE(arm_linux, sys_ptrace);
|
|
|
1c194f |
+DECL_TEMPLATE(arm64_linux, sys_ptrace);
|
|
|
1c194f |
|
|
|
1c194f |
//ZZ PRE(sys_mmap2)
|
|
|
1c194f |
//ZZ {
|
|
|
1c194f |
@@ -459,137 +459,70 @@ PRE(sys_rt_sigreturn)
|
|
|
1c194f |
//ZZ "PRE(sys_cacheflush)" );
|
|
|
1c194f |
//ZZ SET_STATUS_Success(0);
|
|
|
1c194f |
//ZZ }
|
|
|
1c194f |
-//ZZ
|
|
|
1c194f |
-//ZZ // ARG3 is only used for pointers into the traced process's address
|
|
|
1c194f |
-//ZZ // space and for offsets into the traced process's struct
|
|
|
1c194f |
-//ZZ // user_regs_struct. It is never a pointer into this process's memory
|
|
|
1c194f |
-//ZZ // space, and we should therefore not check anything it points to.
|
|
|
1c194f |
-//ZZ PRE(sys_ptrace)
|
|
|
1c194f |
-//ZZ {
|
|
|
1c194f |
-//ZZ PRINT("sys_ptrace ( %ld, %ld, %#lx, %#lx )", ARG1,ARG2,ARG3,ARG4);
|
|
|
1c194f |
-//ZZ PRE_REG_READ4(int, "ptrace",
|
|
|
1c194f |
-//ZZ long, request, long, pid, long, addr, long, data);
|
|
|
1c194f |
-//ZZ switch (ARG1) {
|
|
|
1c194f |
-//ZZ case VKI_PTRACE_PEEKTEXT:
|
|
|
1c194f |
-//ZZ case VKI_PTRACE_PEEKDATA:
|
|
|
1c194f |
-//ZZ case VKI_PTRACE_PEEKUSR:
|
|
|
1c194f |
-//ZZ PRE_MEM_WRITE( "ptrace(peek)", ARG4,
|
|
|
1c194f |
-//ZZ sizeof (long));
|
|
|
1c194f |
-//ZZ break;
|
|
|
1c194f |
-//ZZ case VKI_PTRACE_GETREGS:
|
|
|
1c194f |
-//ZZ PRE_MEM_WRITE( "ptrace(getregs)", ARG4,
|
|
|
1c194f |
-//ZZ sizeof (struct vki_user_regs_struct));
|
|
|
1c194f |
-//ZZ break;
|
|
|
1c194f |
-//ZZ case VKI_PTRACE_GETFPREGS:
|
|
|
1c194f |
-//ZZ PRE_MEM_WRITE( "ptrace(getfpregs)", ARG4,
|
|
|
1c194f |
-//ZZ sizeof (struct vki_user_fp));
|
|
|
1c194f |
-//ZZ break;
|
|
|
1c194f |
-//ZZ case VKI_PTRACE_GETWMMXREGS:
|
|
|
1c194f |
-//ZZ PRE_MEM_WRITE( "ptrace(getwmmxregs)", ARG4,
|
|
|
1c194f |
-//ZZ VKI_IWMMXT_SIZE);
|
|
|
1c194f |
-//ZZ break;
|
|
|
1c194f |
-//ZZ case VKI_PTRACE_GETCRUNCHREGS:
|
|
|
1c194f |
-//ZZ PRE_MEM_WRITE( "ptrace(getcrunchregs)", ARG4,
|
|
|
1c194f |
-//ZZ VKI_CRUNCH_SIZE);
|
|
|
1c194f |
-//ZZ break;
|
|
|
1c194f |
-//ZZ case VKI_PTRACE_GETVFPREGS:
|
|
|
1c194f |
-//ZZ PRE_MEM_WRITE( "ptrace(getvfpregs)", ARG4,
|
|
|
1c194f |
-//ZZ sizeof (struct vki_user_vfp) );
|
|
|
1c194f |
-//ZZ break;
|
|
|
1c194f |
-//ZZ case VKI_PTRACE_GETHBPREGS:
|
|
|
1c194f |
-//ZZ PRE_MEM_WRITE( "ptrace(gethbpregs)", ARG4,
|
|
|
1c194f |
-//ZZ sizeof (unsigned long) );
|
|
|
1c194f |
-//ZZ break;
|
|
|
1c194f |
-//ZZ case VKI_PTRACE_SETREGS:
|
|
|
1c194f |
-//ZZ PRE_MEM_READ( "ptrace(setregs)", ARG4,
|
|
|
1c194f |
-//ZZ sizeof (struct vki_user_regs_struct));
|
|
|
1c194f |
-//ZZ break;
|
|
|
1c194f |
-//ZZ case VKI_PTRACE_SETFPREGS:
|
|
|
1c194f |
-//ZZ PRE_MEM_READ( "ptrace(setfpregs)", ARG4,
|
|
|
1c194f |
-//ZZ sizeof (struct vki_user_fp));
|
|
|
1c194f |
-//ZZ break;
|
|
|
1c194f |
-//ZZ case VKI_PTRACE_SETWMMXREGS:
|
|
|
1c194f |
-//ZZ PRE_MEM_READ( "ptrace(setwmmxregs)", ARG4,
|
|
|
1c194f |
-//ZZ VKI_IWMMXT_SIZE);
|
|
|
1c194f |
-//ZZ break;
|
|
|
1c194f |
-//ZZ case VKI_PTRACE_SETCRUNCHREGS:
|
|
|
1c194f |
-//ZZ PRE_MEM_READ( "ptrace(setcrunchregs)", ARG4,
|
|
|
1c194f |
-//ZZ VKI_CRUNCH_SIZE);
|
|
|
1c194f |
-//ZZ break;
|
|
|
1c194f |
-//ZZ case VKI_PTRACE_SETVFPREGS:
|
|
|
1c194f |
-//ZZ PRE_MEM_READ( "ptrace(setvfpregs)", ARG4,
|
|
|
1c194f |
-//ZZ sizeof (struct vki_user_vfp));
|
|
|
1c194f |
-//ZZ break;
|
|
|
1c194f |
-//ZZ case VKI_PTRACE_SETHBPREGS:
|
|
|
1c194f |
-//ZZ PRE_MEM_READ( "ptrace(sethbpregs)", ARG4, sizeof(unsigned long));
|
|
|
1c194f |
-//ZZ break;
|
|
|
1c194f |
-//ZZ case VKI_PTRACE_GET_THREAD_AREA:
|
|
|
1c194f |
-//ZZ PRE_MEM_WRITE( "ptrace(get_thread_area)", ARG4, sizeof(unsigned long));
|
|
|
1c194f |
-//ZZ break;
|
|
|
1c194f |
-//ZZ case VKI_PTRACE_GETEVENTMSG:
|
|
|
1c194f |
-//ZZ PRE_MEM_WRITE( "ptrace(geteventmsg)", ARG4, sizeof(unsigned long));
|
|
|
1c194f |
-//ZZ break;
|
|
|
1c194f |
-//ZZ case VKI_PTRACE_GETSIGINFO:
|
|
|
1c194f |
-//ZZ PRE_MEM_WRITE( "ptrace(getsiginfo)", ARG4, sizeof(vki_siginfo_t));
|
|
|
1c194f |
-//ZZ break;
|
|
|
1c194f |
-//ZZ case VKI_PTRACE_SETSIGINFO:
|
|
|
1c194f |
-//ZZ PRE_MEM_READ( "ptrace(setsiginfo)", ARG4, sizeof(vki_siginfo_t));
|
|
|
1c194f |
-//ZZ break;
|
|
|
1c194f |
-//ZZ case VKI_PTRACE_GETREGSET:
|
|
|
1c194f |
-//ZZ ML_(linux_PRE_getregset)(tid, ARG3, ARG4);
|
|
|
1c194f |
-//ZZ break;
|
|
|
1c194f |
-//ZZ case VKI_PTRACE_SETREGSET:
|
|
|
1c194f |
-//ZZ ML_(linux_PRE_setregset)(tid, ARG3, ARG4);
|
|
|
1c194f |
-//ZZ break;
|
|
|
1c194f |
-//ZZ default:
|
|
|
1c194f |
-//ZZ break;
|
|
|
1c194f |
-//ZZ }
|
|
|
1c194f |
-//ZZ }
|
|
|
1c194f |
-//ZZ
|
|
|
1c194f |
-//ZZ POST(sys_ptrace)
|
|
|
1c194f |
-//ZZ {
|
|
|
1c194f |
-//ZZ switch (ARG1) {
|
|
|
1c194f |
-//ZZ case VKI_PTRACE_PEEKTEXT:
|
|
|
1c194f |
-//ZZ case VKI_PTRACE_PEEKDATA:
|
|
|
1c194f |
-//ZZ case VKI_PTRACE_PEEKUSR:
|
|
|
1c194f |
-//ZZ POST_MEM_WRITE( ARG4, sizeof (long));
|
|
|
1c194f |
-//ZZ break;
|
|
|
1c194f |
-//ZZ case VKI_PTRACE_GETREGS:
|
|
|
1c194f |
-//ZZ POST_MEM_WRITE( ARG4, sizeof (struct vki_user_regs_struct));
|
|
|
1c194f |
-//ZZ break;
|
|
|
1c194f |
-//ZZ case VKI_PTRACE_GETFPREGS:
|
|
|
1c194f |
-//ZZ POST_MEM_WRITE( ARG4, sizeof (struct vki_user_fp));
|
|
|
1c194f |
-//ZZ break;
|
|
|
1c194f |
-//ZZ case VKI_PTRACE_GETWMMXREGS:
|
|
|
1c194f |
-//ZZ POST_MEM_WRITE( ARG4, VKI_IWMMXT_SIZE);
|
|
|
1c194f |
-//ZZ break;
|
|
|
1c194f |
-//ZZ case VKI_PTRACE_GETCRUNCHREGS:
|
|
|
1c194f |
-//ZZ POST_MEM_WRITE( ARG4, VKI_CRUNCH_SIZE);
|
|
|
1c194f |
-//ZZ break;
|
|
|
1c194f |
-//ZZ case VKI_PTRACE_GETVFPREGS:
|
|
|
1c194f |
-//ZZ POST_MEM_WRITE( ARG4, sizeof(struct vki_user_vfp));
|
|
|
1c194f |
-//ZZ break;
|
|
|
1c194f |
-//ZZ case VKI_PTRACE_GET_THREAD_AREA:
|
|
|
1c194f |
-//ZZ case VKI_PTRACE_GETHBPREGS:
|
|
|
1c194f |
-//ZZ case VKI_PTRACE_GETEVENTMSG:
|
|
|
1c194f |
-//ZZ POST_MEM_WRITE( ARG4, sizeof(unsigned long));
|
|
|
1c194f |
-//ZZ break;
|
|
|
1c194f |
-//ZZ case VKI_PTRACE_GETSIGINFO:
|
|
|
1c194f |
-//ZZ /* XXX: This is a simplification. Different parts of the
|
|
|
1c194f |
-//ZZ * siginfo_t are valid depending on the type of signal.
|
|
|
1c194f |
-//ZZ */
|
|
|
1c194f |
-//ZZ POST_MEM_WRITE( ARG4, sizeof(vki_siginfo_t));
|
|
|
1c194f |
-//ZZ break;
|
|
|
1c194f |
-//ZZ case VKI_PTRACE_GETREGSET:
|
|
|
1c194f |
-//ZZ ML_(linux_POST_getregset)(tid, ARG3, ARG4);
|
|
|
1c194f |
-//ZZ break;
|
|
|
1c194f |
-//ZZ default:
|
|
|
1c194f |
-//ZZ break;
|
|
|
1c194f |
-//ZZ }
|
|
|
1c194f |
-//ZZ }
|
|
|
1c194f |
-//ZZ
|
|
|
1c194f |
-//ZZ #undef PRE
|
|
|
1c194f |
-//ZZ #undef POST
|
|
|
1c194f |
+
|
|
|
1c194f |
+// ARG3 is only used for pointers into the traced process's address
|
|
|
1c194f |
+// space and for offsets into the traced process's struct
|
|
|
1c194f |
+// user_regs_struct. It is never a pointer into this process's memory
|
|
|
1c194f |
+// space, and we should therefore not check anything it points to.
|
|
|
1c194f |
+PRE(sys_ptrace)
|
|
|
1c194f |
+{
|
|
|
1c194f |
+ PRINT("sys_ptrace ( %ld, %ld, %#lx, %#lx )", ARG1,ARG2,ARG3,ARG4);
|
|
|
1c194f |
+ PRE_REG_READ4(int, "ptrace",
|
|
|
1c194f |
+ long, request, long, pid, long, addr, long, data);
|
|
|
1c194f |
+ switch (ARG1) {
|
|
|
1c194f |
+ case VKI_PTRACE_PEEKTEXT:
|
|
|
1c194f |
+ case VKI_PTRACE_PEEKDATA:
|
|
|
1c194f |
+ case VKI_PTRACE_PEEKUSR:
|
|
|
1c194f |
+ PRE_MEM_WRITE( "ptrace(peek)", ARG4,
|
|
|
1c194f |
+ sizeof (long));
|
|
|
1c194f |
+ break;
|
|
|
1c194f |
+ case VKI_PTRACE_GETEVENTMSG:
|
|
|
1c194f |
+ PRE_MEM_WRITE( "ptrace(geteventmsg)", ARG4, sizeof(unsigned long));
|
|
|
1c194f |
+ break;
|
|
|
1c194f |
+ case VKI_PTRACE_GETSIGINFO:
|
|
|
1c194f |
+ PRE_MEM_WRITE( "ptrace(getsiginfo)", ARG4, sizeof(vki_siginfo_t));
|
|
|
1c194f |
+ break;
|
|
|
1c194f |
+ case VKI_PTRACE_SETSIGINFO:
|
|
|
1c194f |
+ PRE_MEM_READ( "ptrace(setsiginfo)", ARG4, sizeof(vki_siginfo_t));
|
|
|
1c194f |
+ break;
|
|
|
1c194f |
+ case VKI_PTRACE_GETREGSET:
|
|
|
1c194f |
+ ML_(linux_PRE_getregset)(tid, ARG3, ARG4);
|
|
|
1c194f |
+ break;
|
|
|
1c194f |
+ case VKI_PTRACE_SETREGSET:
|
|
|
1c194f |
+ ML_(linux_PRE_setregset)(tid, ARG3, ARG4);
|
|
|
1c194f |
+ break;
|
|
|
1c194f |
+ default:
|
|
|
1c194f |
+ break;
|
|
|
1c194f |
+ }
|
|
|
1c194f |
+}
|
|
|
1c194f |
+
|
|
|
1c194f |
+POST(sys_ptrace)
|
|
|
1c194f |
+{
|
|
|
1c194f |
+ switch (ARG1) {
|
|
|
1c194f |
+ case VKI_PTRACE_PEEKTEXT:
|
|
|
1c194f |
+ case VKI_PTRACE_PEEKDATA:
|
|
|
1c194f |
+ case VKI_PTRACE_PEEKUSR:
|
|
|
1c194f |
+ POST_MEM_WRITE( ARG4, sizeof (long));
|
|
|
1c194f |
+ break;
|
|
|
1c194f |
+ case VKI_PTRACE_GETEVENTMSG:
|
|
|
1c194f |
+ POST_MEM_WRITE( ARG4, sizeof(unsigned long));
|
|
|
1c194f |
+ break;
|
|
|
1c194f |
+ case VKI_PTRACE_GETSIGINFO:
|
|
|
1c194f |
+ /* XXX: This is a simplification. Different parts of the
|
|
|
1c194f |
+ * siginfo_t are valid depending on the type of signal.
|
|
|
1c194f |
+ */
|
|
|
1c194f |
+ POST_MEM_WRITE( ARG4, sizeof(vki_siginfo_t));
|
|
|
1c194f |
+ break;
|
|
|
1c194f |
+ case VKI_PTRACE_GETREGSET:
|
|
|
1c194f |
+ ML_(linux_POST_getregset)(tid, ARG3, ARG4);
|
|
|
1c194f |
+ break;
|
|
|
1c194f |
+ default:
|
|
|
1c194f |
+ break;
|
|
|
1c194f |
+ }
|
|
|
1c194f |
+}
|
|
|
1c194f |
+
|
|
|
1c194f |
+#undef PRE
|
|
|
1c194f |
+#undef POST
|
|
|
1c194f |
|
|
|
1c194f |
/* ---------------------------------------------------------------------
|
|
|
1c194f |
The arm64/Linux syscall table
|
|
|
1c194f |
@@ -730,7 +663,7 @@ static SyscallTableEntry syscall_main_table[] = {
|
|
|
1c194f |
LINXY(__NR_clock_getres, sys_clock_getres), // 114
|
|
|
1c194f |
LINXY(__NR_clock_nanosleep, sys_clock_nanosleep), // 115
|
|
|
1c194f |
LINXY(__NR_syslog, sys_syslog), // 116
|
|
|
1c194f |
- // (__NR_ptrace, sys_ptrace), // 117
|
|
|
1c194f |
+ PLAXY(__NR_ptrace, sys_ptrace), // 117
|
|
|
1c194f |
LINXY(__NR_sched_setparam, sys_sched_setparam), // 118
|
|
|
1c194f |
LINX_(__NR_sched_setscheduler,sys_sched_setscheduler),// 119
|
|
|
1c194f |
LINX_(__NR_sched_getscheduler,sys_sched_getscheduler),// 120
|