]> granicus.if.org Git - strace/blobdiff - process.c
Remove linux/ptp_clock.h
[strace] / process.c
index f53c12e0d454f11e712ede37df483d6f0adcc939..b36cd4bc83ca43fcc2392713ac7c6ec851af877a 100644 (file)
--- a/process.c
+++ b/process.c
@@ -8,6 +8,7 @@
  *                    <barrow_dj@mail.yahoo.com,djbarrow@de.ibm.com>
  * Copyright (c) 2000 PocketPenguins Inc.  Linux for Hitachi SuperH
  *                    port by Greg Banks <gbanks@pocketpenguins.com>
+ * Copyright (c) 1999-2017 The strace developers.
  *
  * All rights reserved.
  *
@@ -46,6 +47,7 @@
 #include "ptrace.h"
 #include "xlat/ptrace_cmds.h"
 #include "xlat/ptrace_setoptions_flags.h"
+#include "xlat/ptrace_peeksiginfo_flags.h"
 
 #define uoff(member)   offsetof(struct user, member)
 #define XLAT_UOFF(member)      { uoff(member), "offsetof(struct user, " #member ")" }
@@ -56,7 +58,7 @@ static const struct xlat struct_user_offsets[] = {
 };
 
 static void
-print_user_offset_addr(const unsigned long addr)
+print_user_offset_addr(const kernel_ulong_t addr)
 {
        const struct xlat *x;
 
@@ -72,8 +74,8 @@ print_user_offset_addr(const unsigned long addr)
                        printaddr(addr);
                } else {
                        --x;
-                       tprintf("%s + %lu",
-                               x->str, addr - (unsigned long) x->val);
+                       tprintf("%s + %" PRI_klu,
+                               x->str, addr - (kernel_ulong_t) x->val);
                }
        } else {
                tprints(x->str);
@@ -82,10 +84,10 @@ print_user_offset_addr(const unsigned long addr)
 
 SYS_FUNC(ptrace)
 {
-       const unsigned long request = tcp->u_arg[0];
+       const kernel_ulong_t request = tcp->u_arg[0];
        const int pid = tcp->u_arg[1];
-       const unsigned long addr = tcp->u_arg[2];
-       const unsigned long data = tcp->u_arg[3];
+       const kernel_ulong_t addr = tcp->u_arg[2];
+       const kernel_ulong_t data = tcp->u_arg[3];
 
        if (entering(tcp)) {
                /* request */
@@ -97,70 +99,159 @@ SYS_FUNC(ptrace)
                }
 
                /* pid */
-               tprintf(", %d", pid);
+               tprintf(", %d", pid);
 
                /* addr */
                switch (request) {
+               case PTRACE_ATTACH:
+               case PTRACE_INTERRUPT:
+               case PTRACE_KILL:
+               case PTRACE_LISTEN:
+                       /* addr and data are ignored */
+                       return RVAL_DECODED;
                case PTRACE_PEEKUSER:
                case PTRACE_POKEUSER:
+                       tprints(", ");
                        print_user_offset_addr(addr);
                        break;
                case PTRACE_GETREGSET:
                case PTRACE_SETREGSET:
+                       tprints(", ");
                        printxval(nt_descriptor_types, addr, "NT_???");
                        break;
+               case PTRACE_GETSIGMASK:
+               case PTRACE_SETSIGMASK:
+               case PTRACE_SECCOMP_GET_FILTER:
+                       tprintf(", %" PRI_klu, addr);
+                       break;
+               case PTRACE_PEEKSIGINFO: {
+                       tprints(", ");
+                       struct {
+                               uint64_t off;
+                               uint32_t flags;
+                               uint32_t nr;
+                       } psi;
+                       if (umove_or_printaddr(tcp, addr, &psi)) {
+                               tprints(", ");
+                               printaddr(data);
+                               return RVAL_DECODED;
+                       }
+                       tprintf("{off=%" PRIu64 ", flags=", psi.off);
+                       printflags(ptrace_peeksiginfo_flags, psi.flags,
+                                  "PTRACE_PEEKSIGINFO_???");
+                       tprintf(", nr=%u}", psi.nr);
+                       break;
+               }
                default:
+                       tprints(", ");
                        printaddr(addr);
                }
 
-               tprints(", ");
-
+# if defined IA64 || defined SPARC || defined SPARC64
                switch (request) {
-#ifndef IA64
+#  ifdef IA64
                case PTRACE_PEEKDATA:
                case PTRACE_PEEKTEXT:
                case PTRACE_PEEKUSER:
-                       break;
-#endif
+                       /* data is ignored */
+                       return RVAL_DECODED | RVAL_HEX;
+#  endif /* IA64 */
+#  if defined SPARC || defined SPARC64
+               case PTRACE_GETREGS:
+               case PTRACE_SETREGS:
+               case PTRACE_GETFPREGS:
+               case PTRACE_SETFPREGS:
+                       /* data is ignored */
+                       return RVAL_DECODED;
+#  endif /* SPARC || SPARC64 */
+               }
+# endif /* IA64 || SPARC || SPARC64 */
+
+               tprints(", ");
+
+               /* data */
+               switch (request) {
                case PTRACE_CONT:
-               case PTRACE_SINGLESTEP:
-               case PTRACE_SYSCALL:
                case PTRACE_DETACH:
+               case PTRACE_SYSCALL:
+#ifdef PTRACE_SINGLESTEP
+               case PTRACE_SINGLESTEP:
+#endif
+#ifdef PTRACE_SINGLEBLOCK
+               case PTRACE_SINGLEBLOCK:
+#endif
+#ifdef PTRACE_SYSEMU
+               case PTRACE_SYSEMU:
+#endif
+#ifdef PTRACE_SYSEMU_SINGLESTEP
+               case PTRACE_SYSEMU_SINGLESTEP:
+#endif
                        printsignal(data);
                        break;
+               case PTRACE_SEIZE:
                case PTRACE_SETOPTIONS:
-                       printflags(ptrace_setoptions_flags, data, "PTRACE_O_???");
+#ifdef PTRACE_OLDSETOPTIONS
+               case PTRACE_OLDSETOPTIONS:
+#endif
+                       printflags64(ptrace_setoptions_flags, data, "PTRACE_O_???");
                        break;
                case PTRACE_SETSIGINFO:
                        printsiginfo_at(tcp, data);
                        break;
+               case PTRACE_SETSIGMASK:
+                       print_sigset_addr_len(tcp, data, addr);
+                       break;
                case PTRACE_SETREGSET:
-                       tprint_iov(tcp, /*len:*/ 1, data, /*as string:*/ 0);
+                       tprint_iov(tcp, /*len:*/ 1, data, IOV_DECODE_ADDR);
                        break;
-               case PTRACE_GETSIGINFO:
+#ifndef IA64
+               case PTRACE_PEEKDATA:
+               case PTRACE_PEEKTEXT:
+               case PTRACE_PEEKUSER:
+#endif
+               case PTRACE_GETEVENTMSG:
                case PTRACE_GETREGSET:
-                       /* Don't print anything, do it at syscall return. */
-                       break;
+               case PTRACE_GETSIGINFO:
+               case PTRACE_GETSIGMASK:
+               case PTRACE_PEEKSIGINFO:
+               case PTRACE_SECCOMP_GET_FILTER:
+                       if (verbose(tcp)) {
+                               /* print data on exiting syscall */
+                               return 0;
+                       }
+                       /* fall through */
                default:
                        printaddr(data);
                        break;
                }
+
+               return RVAL_DECODED;
        } else {
                switch (request) {
+#ifndef IA64
                case PTRACE_PEEKDATA:
                case PTRACE_PEEKTEXT:
                case PTRACE_PEEKUSER:
-#ifdef IA64
-                       return RVAL_HEX;
-#else
                        printnum_ptr(tcp, data);
                        break;
 #endif
+               case PTRACE_GETEVENTMSG:
+                       printnum_ulong(tcp, data);
+                       break;
+               case PTRACE_GETREGSET:
+                       tprint_iov(tcp, /*len:*/ 1, data, IOV_DECODE_ADDR);
+                       break;
                case PTRACE_GETSIGINFO:
                        printsiginfo_at(tcp, data);
                        break;
-               case PTRACE_GETREGSET:
-                       tprint_iov(tcp, /*len:*/ 1, data, /*as string:*/ 0);
+               case PTRACE_GETSIGMASK:
+                       print_sigset_addr_len(tcp, data, addr);
+                       break;
+               case PTRACE_PEEKSIGINFO:
+                       print_siginfo_array(tcp, data, tcp->u_rval);
+                       break;
+               case PTRACE_SECCOMP_GET_FILTER:
+                       print_seccomp_fprog(tcp, data, tcp->u_rval);
                        break;
                }
        }