Patched in Tegra support.

1 files changed, 93 insertions, 47 deletions

diff --git a/include/linux/ptrace.h b/include/linux/ptrace.h
index 1693775ecfe..800f113bea6 100644
--- a/include/linux/ptrace.h
+++ b/include/linux/ptrace.h
@@ -1,12 +1,82 @@
 #ifndef _LINUX_PTRACE_H
 #define _LINUX_PTRACE_H
+/* ptrace.h */
+/* structs and defines to help the user use the ptrace system call. */
 
-#include <linux/compiler.h>             /* For unlikely.  */
-#include <linux/sched.h>                /* For struct task_struct.  */
-#include <linux/err.h>                  /* for IS_ERR_VALUE */
-#include <linux/bug.h>                  /* For BUG_ON.  */
-#include <uapi/linux/ptrace.h>
+/* has the defines to get at the registers. */
+
+#define PTRACE_TRACEME             0
+#define PTRACE_PEEKTEXT            1
+#define PTRACE_PEEKDATA            2
+#define PTRACE_PEEKUSR             3
+#define PTRACE_POKETEXT            4
+#define PTRACE_POKEDATA            5
+#define PTRACE_POKEUSR             6
+#define PTRACE_CONT                7
+#define PTRACE_KILL                8
+#define PTRACE_SINGLESTEP          9
+
+#define PTRACE_ATTACH             16
+#define PTRACE_DETACH             17
 
+#define PTRACE_SYSCALL            24
+
+/* 0x4200-0x4300 are reserved for architecture-independent additions.  */
+#define PTRACE_SETOPTIONS       0x4200
+#define PTRACE_GETEVENTMSG      0x4201
+#define PTRACE_GETSIGINFO       0x4202
+#define PTRACE_SETSIGINFO       0x4203
+
+/*
+ * Generic ptrace interface that exports the architecture specific regsets
+ * using the corresponding NT_* types (which are also used in the core dump).
+ * Please note that the NT_PRSTATUS note type in a core dump contains a full
+ * 'struct elf_prstatus'. But the user_regset for NT_PRSTATUS contains just the
+ * elf_gregset_t that is the pr_reg field of 'struct elf_prstatus'. For all the
+ * other user_regset flavors, the user_regset layout and the ELF core dump note
+ * payload are exactly the same layout.
+ *
+ * This interface usage is as follows:
+ *      struct iovec iov = { buf, len};
+ *
+ *      ret = ptrace(PTRACE_GETREGSET/PTRACE_SETREGSET, pid, NT_XXX_TYPE, &iov);
+ *
+ * On the successful completion, iov.len will be updated by the kernel,
+ * specifying how much the kernel has written/read to/from the user's iov.buf.
+ */
+#define PTRACE_GETREGSET        0x4204
+#define PTRACE_SETREGSET        0x4205
+
+#define PTRACE_SEIZE            0x4206
+#define PTRACE_INTERRUPT        0x4207
+#define PTRACE_LISTEN           0x4208
+
+/* flags in @data for PTRACE_SEIZE */
+#define PTRACE_SEIZE_DEVEL      0x80000000 /* temp flag for development */
+
+/* options set using PTRACE_SETOPTIONS */
+#define PTRACE_O_TRACESYSGOOD   0x00000001
+#define PTRACE_O_TRACEFORK      0x00000002
+#define PTRACE_O_TRACEVFORK     0x00000004
+#define PTRACE_O_TRACECLONE     0x00000008
+#define PTRACE_O_TRACEEXEC      0x00000010
+#define PTRACE_O_TRACEVFORKDONE 0x00000020
+#define PTRACE_O_TRACEEXIT      0x00000040
+
+#define PTRACE_O_MASK           0x0000007f
+
+/* Wait extended result codes for the above trace options.  */
+#define PTRACE_EVENT_FORK       1
+#define PTRACE_EVENT_VFORK      2
+#define PTRACE_EVENT_CLONE      3
+#define PTRACE_EVENT_EXEC       4
+#define PTRACE_EVENT_VFORK_DONE 5
+#define PTRACE_EVENT_EXIT       6
+#define PTRACE_EVENT_STOP       7
+
+#include <asm/ptrace.h>
+
+#ifdef __KERNEL__
 /*
  * Ptrace flags
  *
@@ -18,21 +88,21 @@
 #define PT_SEIZED       0x00010000      /* SEIZE used, enable new behavior */
 #define PT_PTRACED      0x00000001
 #define PT_DTRACE       0x00000002      /* delayed trace (used on m68k, i386) */
-#define PT_PTRACE_CAP   0x00000004      /* ptracer can follow suid-exec */
+#define PT_TRACESYSGOOD 0x00000004
+#define PT_PTRACE_CAP   0x00000008      /* ptracer can follow suid-exec */
 
-#define PT_OPT_FLAG_SHIFT       3
 /* PT_TRACE_* event enable flags */
-#define PT_EVENT_FLAG(event)    (1 << (PT_OPT_FLAG_SHIFT + (event)))
-#define PT_TRACESYSGOOD         PT_EVENT_FLAG(0)
+#define PT_EVENT_FLAG_SHIFT     4
+#define PT_EVENT_FLAG(event)    (1 << (PT_EVENT_FLAG_SHIFT + (event) - 1))
+
 #define PT_TRACE_FORK           PT_EVENT_FLAG(PTRACE_EVENT_FORK)
 #define PT_TRACE_VFORK          PT_EVENT_FLAG(PTRACE_EVENT_VFORK)
 #define PT_TRACE_CLONE          PT_EVENT_FLAG(PTRACE_EVENT_CLONE)
 #define PT_TRACE_EXEC           PT_EVENT_FLAG(PTRACE_EVENT_EXEC)
 #define PT_TRACE_VFORK_DONE     PT_EVENT_FLAG(PTRACE_EVENT_VFORK_DONE)
 #define PT_TRACE_EXIT           PT_EVENT_FLAG(PTRACE_EVENT_EXIT)
-#define PT_TRACE_SECCOMP        PT_EVENT_FLAG(PTRACE_EVENT_SECCOMP)
 
-#define PT_EXITKILL             (PTRACE_O_EXITKILL << PT_OPT_FLAG_SHIFT)
+#define PT_TRACE_MASK   0x000003f4
 
 /* single stepping state bits (used on ARM and PA-RISC) */
 #define PT_SINGLESTEP_BIT       31
@@ -40,6 +110,10 @@
 #define PT_BLOCKSTEP_BIT        30
 #define PT_BLOCKSTEP            (1<<PT_BLOCKSTEP_BIT)
 
+#include <linux/compiler.h>             /* For unlikely.  */
+#include <linux/sched.h>                /* For struct task_struct.  */
+
+
 extern long arch_ptrace(struct task_struct *child, long request,
                         unsigned long addr, unsigned long data);
 extern int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst, int len);
@@ -53,9 +127,10 @@ extern void __ptrace_link(struct task_struct *child,
                           struct task_struct *new_parent);
 extern void __ptrace_unlink(struct task_struct *child);
 extern void exit_ptrace(struct task_struct *tracer);
-#define PTRACE_MODE_READ        0x01
-#define PTRACE_MODE_ATTACH      0x02
-#define PTRACE_MODE_NOAUDIT     0x04
+#define PTRACE_MODE_READ   1
+#define PTRACE_MODE_ATTACH 2
+/* Returns 0 on success, -errno on denial. */
+extern int __ptrace_may_access(struct task_struct *task, unsigned int mode);
 /* Returns true on success, false on denial. */
 extern bool ptrace_may_access(struct task_struct *task, unsigned int mode);
 
@@ -122,10 +197,9 @@ static inline void ptrace_event(int event, unsigned long message)
         if (unlikely(ptrace_event_enabled(current, event))) {
                 current->ptrace_message = message;
                 ptrace_notify((event << 8) | SIGTRAP);
-        } else if (event == PTRACE_EVENT_EXEC) {
+        } else if (event == PTRACE_EVENT_EXEC && unlikely(current->ptrace)) {
                 /* legacy EXEC report via SIGTRAP */
-                if ((current->ptrace & (PT_PTRACED|PT_SEIZED)) == PT_PTRACED)
-                        send_sig(SIGTRAP, current, 0);
+                send_sig(SIGTRAP, current, 0);
         }
 }
 
@@ -191,15 +265,6 @@ static inline void ptrace_release_task(struct task_struct *task)
 #define force_successful_syscall_return() do { } while (0)
 #endif
 
-#ifndef is_syscall_success
-/*
- * On most systems we can tell if a syscall is a success based on if the retval
- * is an error value.  On some systems like ia64 and powerpc they have different
- * indicators of success/failure and must define their own.
- */
-#define is_syscall_success(regs) (!IS_ERR_VALUE((unsigned long)(regs_return_value(regs))))
-#endif
-
 /*
  * <asm/ptrace.h> should define the following things inside #ifdef __KERNEL__.
  *
@@ -327,27 +392,6 @@ static inline void user_single_step_siginfo(struct task_struct *tsk,
 #define arch_ptrace_stop(code, info)            do { } while (0)
 #endif
 
-#ifndef current_pt_regs
-#define current_pt_regs() task_pt_regs(current)
-#endif
-
-#ifndef ptrace_signal_deliver
-#define ptrace_signal_deliver() ((void)0)
-#endif
-
-/*
- * unlike current_pt_regs(), this one is equal to task_pt_regs(current)
- * on *all* architectures; the only reason to have a per-arch definition
- * is optimisation.
- */
-#ifndef signal_pt_regs
-#define signal_pt_regs() task_pt_regs(current)
-#endif
-
-#ifndef current_user_stack_pointer
-#define current_user_stack_pointer() user_stack_pointer(current_pt_regs())
-#endif
-
 extern int task_current_syscall(struct task_struct *target, long *callno,
                                 unsigned long args[6], unsigned int maxargs,
                                 unsigned long *sp, unsigned long *pc);
@@ -359,4 +403,6 @@ extern void ptrace_put_breakpoints(struct task_struct *tsk);
 static inline void ptrace_put_breakpoints(struct task_struct *tsk) { }
 #endif /* CONFIG_HAVE_HW_BREAKPOINT */
 
+#endif /* __KERNEL */
+
 #endif