[POWERPC] Add CHECK_FULL_REGS in several places in ptrace code

This restores the CHECK_FULL_REGS sanity check to every place that can
access the nonvolatile GPRs for ptrace.  This is already done for
native-bitwidth PTRACE_PEEKUSR, but was omitted for many other cases
(32-bit ptrace, PTRACE_GETREGS, etc.); I think there may have been more
uniform checks before that were lost in the recent cleanup of GETREGS et al.

Signed-off-by: Roland McGrath <roland@redhat.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
index fb8866e0e35d3cc3f43f96144adccbff23f265c7..cf7732cdd6c7e1ef65df511297dceac941e54ef5 100644 (file)
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
@@ -331,6 +331,7 @@ static long arch_ptrace_old(struct task_struct *child, long request, long addr,
                unsigned long *reg = &((unsigned long *)child->thread.regs)[0];
                unsigned long __user *tmp = (unsigned long __user *)addr;
 
+               CHECK_FULL_REGS(child->thread.regs);
                for (i = 0; i < 32; i++) {
                        ret = put_user(*reg, tmp);
                        if (ret)
@@ -346,6 +347,7 @@ static long arch_ptrace_old(struct task_struct *child, long request, long addr,
                unsigned long *reg = &((unsigned long *)child->thread.regs)[0];
                unsigned long __user *tmp = (unsigned long __user *)addr;
 
+               CHECK_FULL_REGS(child->thread.regs);
                for (i = 0; i < 32; i++) {
                        ret = get_user(*reg, tmp);
                        if (ret)
@@ -517,6 +519,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                        ret = -EIO;
                        break;
                }
+               CHECK_FULL_REGS(child->thread.regs);
                ret = 0;
                for (ui = 0; ui < PT_REGS_COUNT; ui ++) {
                        ret |= __put_user(ptrace_get_reg(child, ui),
@@ -537,6 +540,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                        ret = -EIO;
                        break;
                }
+               CHECK_FULL_REGS(child->thread.regs);
                ret = 0;
                for (ui = 0; ui < PT_REGS_COUNT; ui ++) {
                        ret = __get_user(tmp, (unsigned long __user *) data);

diff --git a/arch/powerpc/kernel/ptrace32.c b/arch/powerpc/kernel/ptrace32.c
index 9e6baeac0fb1e569e4fe35bd279d311318d93af2..fea6206ff90fd69aaf363075181a927049cb552d 100644 (file)
--- a/arch/powerpc/kernel/ptrace32.c
+++ b/arch/powerpc/kernel/ptrace32.c
@@ -53,6 +53,7 @@ static long compat_ptrace_old(struct task_struct *child, long request,
                unsigned long *reg = &((unsigned long *)child->thread.regs)[0];
                unsigned int __user *tmp = (unsigned int __user *)addr;
 
+               CHECK_FULL_REGS(child->thread.regs);
                for (i = 0; i < 32; i++) {
                        ret = put_user(*reg, tmp);
                        if (ret)
@@ -68,6 +69,7 @@ static long compat_ptrace_old(struct task_struct *child, long request,
                unsigned long *reg = &((unsigned long *)child->thread.regs)[0];
                unsigned int __user *tmp = (unsigned int __user *)addr;
 
+               CHECK_FULL_REGS(child->thread.regs);
                for (i = 0; i < 32; i++) {
                        ret = get_user(*reg, tmp);
                        if (ret)
@@ -164,6 +166,7 @@ long compat_sys_ptrace(int request, int pid, unsigned long addr,
                if ((addr & 3) || (index > PT_FPSCR32))
                        break;
 
+               CHECK_FULL_REGS(child->thread.regs);
                if (index < PT_FPR0) {
                        tmp = ptrace_get_reg(child, index);
                } else {
@@ -210,6 +213,7 @@ long compat_sys_ptrace(int request, int pid, unsigned long addr,
                if ((addr & 3) || numReg > PT_FPSCR)
                        break;
 
+               CHECK_FULL_REGS(child->thread.regs);
                if (numReg >= PT_FPR0) {
                        flush_fp_to_thread(child);
                        tmp = ((unsigned long int *)child->thread.fpr)[numReg - PT_FPR0];
@@ -270,6 +274,7 @@ long compat_sys_ptrace(int request, int pid, unsigned long addr,
                if ((addr & 3) || (index > PT_FPSCR32))
                        break;
 
+               CHECK_FULL_REGS(child->thread.regs);
                if (index < PT_FPR0) {
                        ret = ptrace_put_reg(child, index, data);
                } else {
@@ -307,6 +312,7 @@ long compat_sys_ptrace(int request, int pid, unsigned long addr,
                 */
                if ((addr & 3) || (numReg > PT_FPSCR))
                        break;
+               CHECK_FULL_REGS(child->thread.regs);
                if (numReg < PT_FPR0) {
                        unsigned long freg = ptrace_get_reg(child, numReg);
                        if (index % 2)
@@ -342,6 +348,7 @@ long compat_sys_ptrace(int request, int pid, unsigned long addr,
                        ret = -EIO;
                        break;
                }
+               CHECK_FULL_REGS(child->thread.regs);
                ret = 0;
                for (ui = 0; ui < PT_REGS_COUNT; ui ++) {
                        ret |= __put_user(ptrace_get_reg(child, ui),
@@ -359,6 +366,7 @@ long compat_sys_ptrace(int request, int pid, unsigned long addr,
                        ret = -EIO;
                        break;
                }
+               CHECK_FULL_REGS(child->thread.regs);
                ret = 0;
                for (ui = 0; ui < PT_REGS_COUNT; ui ++) {
                        ret = __get_user(tmp, (unsigned int __user *) data);