Blackfin: cleanup traps decode_address() a bit

[safe/jmp/linux-2.6] / arch / blackfin / kernel / ptrace.c

diff --git a/arch/blackfin/kernel/ptrace.c b/arch/blackfin/kernel/ptrace.c
index e8172ee..6a387ee 100644 (file)
--- a/arch/blackfin/kernel/ptrace.c
+++ b/arch/blackfin/kernel/ptrace.c
@@ -31,7 +31,6 @@
 #include <linux/sched.h>
 #include <linux/mm.h>
 #include <linux/smp.h>
-#include <linux/smp_lock.h>
 #include <linux/errno.h>
 #include <linux/ptrace.h>
 #include <linux/user.h>
@@ -45,6 +44,8 @@
 #include <asm/asm-offsets.h>
 #include <asm/dma.h>
 #include <asm/fixed_code.h>
+#include <asm/cacheflush.h>
+#include <asm/mem_map.h>
 
 #define TEXT_OFFSET 0
 /*
@@ -80,10 +81,12 @@ static inline struct pt_regs *get_user_regs(struct task_struct *task)
 /*
  * Get all user integer registers.
  */
-static inline int ptrace_getregs(struct task_struct *tsk, void __user * uregs)
+static inline int ptrace_getregs(struct task_struct *tsk, void __user *uregs)
 {
-       struct pt_regs *regs = get_user_regs(tsk);
-       return copy_to_user(uregs, regs, sizeof(struct pt_regs)) ? -EFAULT : 0;
+       struct pt_regs regs;
+       memcpy(&regs, get_user_regs(tsk), sizeof(regs));
+       regs.usp = tsk->thread.usp;
+       return copy_to_user(uregs, &regs, sizeof(struct pt_regs)) ? -EFAULT : 0;
 }
 
 /* Mapping from PT_xxx to the stack offset at which the register is
@@ -157,19 +160,23 @@ put_reg(struct task_struct *task, int regno, unsigned long data)
 static inline int is_user_addr_valid(struct task_struct *child,
                                     unsigned long start, unsigned long len)
 {
-       struct vm_list_struct *vml;
+       struct vm_area_struct *vma;
        struct sram_list_struct *sraml;
 
-       for (vml = child->mm->context.vmlist; vml; vml = vml->next)
-               if (start >= vml->vma->vm_start && start + len <= vml->vma->vm_end)
+       /* overflow */
+       if (start + len < start)
+               return -EIO;
+
+       vma = find_vma(child->mm, start);
+       if (vma && start >= vma->vm_start && start + len <= vma->vm_end)
                        return 0;
 
        for (sraml = child->mm->context.sram_list; sraml; sraml = sraml->next)
                if (start >= (unsigned long)sraml->addr
-                   && start + len <= (unsigned long)sraml->addr + sraml->length)
+                   && start + len < (unsigned long)sraml->addr + sraml->length)
                        return 0;
 
-       if (start >= FIXED_CODE_START && start + len <= FIXED_CODE_END)
+       if (start >= FIXED_CODE_START && start + len < FIXED_CODE_END)
                return 0;
 
        return -EIO;
@@ -216,34 +223,30 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                                break;
                        pr_debug("ptrace: user address is valid\n");
 
-#if L1_CODE_LENGTH != 0
-                       if (addr >= L1_CODE_START
-                           && addr + sizeof(tmp) <= L1_CODE_START + L1_CODE_LENGTH) {
+                       if (L1_CODE_LENGTH != 0 && addr >= get_l1_code_start()
+                           && addr + sizeof(tmp) <= get_l1_code_start() + L1_CODE_LENGTH) {
                                safe_dma_memcpy (&tmp, (const void *)(addr), sizeof(tmp));
                                copied = sizeof(tmp);
-                       } else
-#endif
-#if L1_DATA_A_LENGTH != 0
-                       if (addr >= L1_DATA_A_START
+
+                       } else if (L1_DATA_A_LENGTH != 0 && addr >= L1_DATA_A_START
                            && addr + sizeof(tmp) <= L1_DATA_A_START + L1_DATA_A_LENGTH) {
                                memcpy(&tmp, (const void *)(addr), sizeof(tmp));
                                copied = sizeof(tmp);
-                       } else
-#endif
-#if L1_DATA_B_LENGTH != 0
-                       if (addr >= L1_DATA_B_START
+
+                       } else if (L1_DATA_B_LENGTH != 0 && addr >= L1_DATA_B_START
                            && addr + sizeof(tmp) <= L1_DATA_B_START + L1_DATA_B_LENGTH) {
                                memcpy(&tmp, (const void *)(addr), sizeof(tmp));
                                copied = sizeof(tmp);
-                       } else
-#endif
-                       if (addr >= FIXED_CODE_START
+
+                       } else if (addr >= FIXED_CODE_START
                            && addr + sizeof(tmp) <= FIXED_CODE_END) {
-                               memcpy(&tmp, (const void *)(addr), sizeof(tmp));
+                               copy_from_user_page(0, 0, 0, &tmp, (const void *)(addr), sizeof(tmp));
                                copied = sizeof(tmp);
+
                        } else
                                copied = access_process_vm(child, addr, &tmp,
                                                           sizeof(tmp), 0);
+
                        pr_debug("ptrace: copied size %d [0x%08lx]\n", copied, tmp);
                        if (copied != sizeof(tmp))
                                break;
@@ -300,34 +303,30 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                                break;
                        pr_debug("ptrace: user address is valid\n");
 
-#if L1_CODE_LENGTH != 0
-                       if (addr >= L1_CODE_START
-                           && addr + sizeof(data) <= L1_CODE_START + L1_CODE_LENGTH) {
+                       if (L1_CODE_LENGTH != 0 && addr >= get_l1_code_start()
+                           && addr + sizeof(data) <= get_l1_code_start() + L1_CODE_LENGTH) {
                                safe_dma_memcpy ((void *)(addr), &data, sizeof(data));
                                copied = sizeof(data);
-                       } else
-#endif
-#if L1_DATA_A_LENGTH != 0
-                       if (addr >= L1_DATA_A_START
+
+                       } else if (L1_DATA_A_LENGTH != 0 && addr >= L1_DATA_A_START
                            && addr + sizeof(data) <= L1_DATA_A_START + L1_DATA_A_LENGTH) {
                                memcpy((void *)(addr), &data, sizeof(data));
                                copied = sizeof(data);
-                       } else
-#endif
-#if L1_DATA_B_LENGTH != 0
-                       if (addr >= L1_DATA_B_START
+
+                       } else if (L1_DATA_B_LENGTH != 0 && addr >= L1_DATA_B_START
                            && addr + sizeof(data) <= L1_DATA_B_START + L1_DATA_B_LENGTH) {
                                memcpy((void *)(addr), &data, sizeof(data));
                                copied = sizeof(data);
-                       } else
-#endif
-                       if (addr >= FIXED_CODE_START
+
+                       } else if (addr >= FIXED_CODE_START
                            && addr + sizeof(data) <= FIXED_CODE_END) {
-                               memcpy((void *)(addr), &data, sizeof(data));
+                               copy_to_user_page(0, 0, 0, (void *)(addr), &data, sizeof(data));
                                copied = sizeof(data);
+
                        } else
                                copied = access_process_vm(child, addr, &data,
                                                           sizeof(data), 1);
+
                        pr_debug("ptrace: copied size %d\n", copied);
                        if (copied != sizeof(data))
                                break;