Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

1 files changed, 8 insertions, 2 deletions

diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
index 7673e9865733..2a9fe97e4521 100644
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
@@ -530,15 +530,21 @@ static int gpr32_set(struct task_struct *target,
                 --count;
         }
 
-        if (kbuf)
+        if (kbuf) {
                 for (; count > 0 && pos <= PT_MAX_PUT_REG; --count)
                         regs[pos++] = *k++;
-        else
+                for (; count > 0 && pos < PT_TRAP; --count, ++pos)
+                        ++k;
+        } else {
                 for (; count > 0 && pos <= PT_MAX_PUT_REG; --count) {
                         if (__get_user(reg, u++))
                                 return -EFAULT;
                         regs[pos++] = reg;
                 }
+                for (; count > 0 && pos < PT_TRAP; --count, ++pos)
+                        if (__get_user(reg, u++))
+                                return -EFAULT;
+        }
 
         if (count > 0 && pos == PT_TRAP) {
                 if (kbuf)