openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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>
This commit is contained in:
Roland McGrath 2007-09-25 09:50:52 +10:00 committed by Paul Mackerras
parent fec6047047
commit fabca2c0a4
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/kernel/ptrace.c
View File

@ -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 *reg = &((unsigned long *)child->thread.regs)[0];
unsigned long __user *tmp = (unsigned long __user *)addr; unsigned long __user *tmp = (unsigned long __user *)addr;
CHECK_FULL_REGS(child->thread.regs);
for (i = 0; i < 32; i++) { for (i = 0; i < 32; i++) {
ret = put_user(*reg, tmp); ret = put_user(*reg, tmp);
if (ret) 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 *reg = &((unsigned long *)child->thread.regs)[0];
unsigned long __user *tmp = (unsigned long __user *)addr; unsigned long __user *tmp = (unsigned long __user *)addr;
CHECK_FULL_REGS(child->thread.regs);
for (i = 0; i < 32; i++) { for (i = 0; i < 32; i++) {
ret = get_user(*reg, tmp); ret = get_user(*reg, tmp);
if (ret) if (ret)
@ -517,6 +519,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
ret = -EIO; ret = -EIO;
break; break;
} }
CHECK_FULL_REGS(child->thread.regs);
ret = 0; ret = 0;
for (ui = 0; ui < PT_REGS_COUNT; ui ++) { for (ui = 0; ui < PT_REGS_COUNT; ui ++) {
ret |= __put_user(ptrace_get_reg(child, 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; ret = -EIO;
break; break;
} }
CHECK_FULL_REGS(child->thread.regs);
ret = 0; ret = 0;
for (ui = 0; ui < PT_REGS_COUNT; ui ++) { for (ui = 0; ui < PT_REGS_COUNT; ui ++) {
ret = __get_user(tmp, (unsigned long __user *) data); ret = __get_user(tmp, (unsigned long __user *) data);

8
arch/powerpc/kernel/ptrace32.c
View File

@ -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 long *reg = &((unsigned long *)child->thread.regs)[0];
unsigned int __user *tmp = (unsigned int __user *)addr; unsigned int __user *tmp = (unsigned int __user *)addr;
CHECK_FULL_REGS(child->thread.regs);
for (i = 0; i < 32; i++) { for (i = 0; i < 32; i++) {
ret = put_user(*reg, tmp); ret = put_user(*reg, tmp);
if (ret) 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 long *reg = &((unsigned long *)child->thread.regs)[0];
unsigned int __user *tmp = (unsigned int __user *)addr; unsigned int __user *tmp = (unsigned int __user *)addr;
CHECK_FULL_REGS(child->thread.regs);
for (i = 0; i < 32; i++) { for (i = 0; i < 32; i++) {
ret = get_user(*reg, tmp); ret = get_user(*reg, tmp);
if (ret) if (ret)
@ -164,6 +166,7 @@ long compat_sys_ptrace(int request, int pid, unsigned long addr,
if ((addr & 3) || (index > PT_FPSCR32)) if ((addr & 3) || (index > PT_FPSCR32))
break; break;
CHECK_FULL_REGS(child->thread.regs);
if (index < PT_FPR0) { if (index < PT_FPR0) {
tmp = ptrace_get_reg(child, index); tmp = ptrace_get_reg(child, index);
} else { } else {
@ -210,6 +213,7 @@ long compat_sys_ptrace(int request, int pid, unsigned long addr,
if ((addr & 3) || numReg > PT_FPSCR) if ((addr & 3) || numReg > PT_FPSCR)
break; break;
CHECK_FULL_REGS(child->thread.regs);
if (numReg >= PT_FPR0) { if (numReg >= PT_FPR0) {
flush_fp_to_thread(child); flush_fp_to_thread(child);
tmp = ((unsigned long int *)child->thread.fpr)[numReg - PT_FPR0]; 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)) if ((addr & 3) || (index > PT_FPSCR32))
break; break;
CHECK_FULL_REGS(child->thread.regs);
if (index < PT_FPR0) { if (index < PT_FPR0) {
ret = ptrace_put_reg(child, index, data); ret = ptrace_put_reg(child, index, data);
} else { } else {
@ -307,6 +312,7 @@ long compat_sys_ptrace(int request, int pid, unsigned long addr,
*/ */
if ((addr & 3) || (numReg > PT_FPSCR)) if ((addr & 3) || (numReg > PT_FPSCR))
break; break;
CHECK_FULL_REGS(child->thread.regs);
if (numReg < PT_FPR0) { if (numReg < PT_FPR0) {
unsigned long freg = ptrace_get_reg(child, numReg); unsigned long freg = ptrace_get_reg(child, numReg);
if (index % 2) if (index % 2)
@ -342,6 +348,7 @@ long compat_sys_ptrace(int request, int pid, unsigned long addr,
ret = -EIO; ret = -EIO;
break; break;
} }
CHECK_FULL_REGS(child->thread.regs);
ret = 0; ret = 0;
for (ui = 0; ui < PT_REGS_COUNT; ui ++) { for (ui = 0; ui < PT_REGS_COUNT; ui ++) {
ret |= __put_user(ptrace_get_reg(child, 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; ret = -EIO;
break; break;
} }
CHECK_FULL_REGS(child->thread.regs);
ret = 0; ret = 0;
for (ui = 0; ui < PT_REGS_COUNT; ui ++) { for (ui = 0; ui < PT_REGS_COUNT; ui ++) {
ret = __get_user(tmp, (unsigned int __user *) data); ret = __get_user(tmp, (unsigned int __user *) data);