projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[MIPS] N32: Make sure pointer is good before passing it to sys_waitid().
[powerpc.git]
/
arch
/
mips
/
kernel
/
ptrace32.c
diff --git
a/arch/mips/kernel/ptrace32.c
b/arch/mips/kernel/ptrace32.c
index
7e55457
..
0d5cf97
100644
(file)
--- a/
arch/mips/kernel/ptrace32.c
+++ b/
arch/mips/kernel/ptrace32.c
@@
-88,7
+88,7
@@
asmlinkage int sys32_ptrace(int request, int pid, int addr, int data)
ret = -EIO;
if (copied != sizeof(tmp))
break;
ret = -EIO;
if (copied != sizeof(tmp))
break;
- ret = put_user(tmp, (unsigned int *) (unsigned long) data);
+ ret = put_user(tmp, (unsigned int
__user
*) (unsigned long) data);
break;
}
break;
}
@@
-126,8
+126,7
@@
asmlinkage int sys32_ptrace(int request, int pid, int addr, int data)
struct pt_regs *regs;
unsigned int tmp;
struct pt_regs *regs;
unsigned int tmp;
- regs = (struct pt_regs *) ((unsigned long) child->thread_info +
- THREAD_SIZE - 32 - sizeof(struct pt_regs));
+ regs = task_pt_regs(child);
ret = 0; /* Default return value. */
switch (addr) {
ret = 0; /* Default return value. */
switch (addr) {
@@
-175,8
+174,10
@@
asmlinkage int sys32_ptrace(int request, int pid, int addr, int data)
case FPC_EIR: { /* implementation / version register */
unsigned int flags;
case FPC_EIR: { /* implementation / version register */
unsigned int flags;
- if (!cpu_has_fpu)
+ if (!cpu_has_fpu) {
+ tmp = 0;
break;
break;
+ }
preempt_disable();
if (cpu_has_mipsmt) {
preempt_disable();
if (cpu_has_mipsmt) {
@@
-195,19
+196,18
@@
asmlinkage int sys32_ptrace(int request, int pid, int addr, int data)
preempt_enable();
break;
}
preempt_enable();
break;
}
- case DSP_BASE ... DSP_BASE + 5:
+ case DSP_BASE ... DSP_BASE + 5: {
+ dspreg_t *dregs;
+
if (!cpu_has_dsp) {
tmp = 0;
ret = -EIO;
goto out_tsk;
}
if (!cpu_has_dsp) {
tmp = 0;
ret = -EIO;
goto out_tsk;
}
- if (child->thread.dsp.used_dsp) {
- dspreg_t *dregs = __get_dsp_regs(child);
- tmp = (unsigned long) (dregs[addr - DSP_BASE]);
- } else {
- tmp = -1; /* DSP registers yet used */
- }
+ dregs = __get_dsp_regs(child);
+ tmp = (unsigned long) (dregs[addr - DSP_BASE]);
break;
break;
+ }
case DSP_CONTROL:
if (!cpu_has_dsp) {
tmp = 0;
case DSP_CONTROL:
if (!cpu_has_dsp) {
tmp = 0;
@@
-221,7
+221,7
@@
asmlinkage int sys32_ptrace(int request, int pid, int addr, int data)
ret = -EIO;
goto out_tsk;
}
ret = -EIO;
goto out_tsk;
}
- ret = put_user(tmp, (unsigned *) (unsigned long) data);
+ ret = put_user(tmp, (unsigned
__user
*) (unsigned long) data);
break;
}
break;
}
@@
-263,8
+263,7
@@
asmlinkage int sys32_ptrace(int request, int pid, int addr, int data)
case PTRACE_POKEUSR: {
struct pt_regs *regs;
ret = 0;
case PTRACE_POKEUSR: {
struct pt_regs *regs;
ret = 0;
- regs = (struct pt_regs *) ((unsigned long) child->thread_info +
- THREAD_SIZE - 32 - sizeof(struct pt_regs));
+ regs = task_pt_regs(child);
switch (addr) {
case 0 ... 31:
switch (addr) {
case 0 ... 31:
@@
-310,15
+309,18
@@
asmlinkage int sys32_ptrace(int request, int pid, int addr, int data)
else
child->thread.fpu.soft.fcr31 = data;
break;
else
child->thread.fpu.soft.fcr31 = data;
break;
- case DSP_BASE ... DSP_BASE + 5:
+ case DSP_BASE ... DSP_BASE + 5: {
+ dspreg_t *dregs;
+
if (!cpu_has_dsp) {
ret = -EIO;
break;
}
if (!cpu_has_dsp) {
ret = -EIO;
break;
}
- d
spreg_t *d
regs = __get_dsp_regs(child);
+ dregs = __get_dsp_regs(child);
dregs[addr - DSP_BASE] = data;
break;
dregs[addr - DSP_BASE] = data;
break;
+ }
case DSP_CONTROL:
if (!cpu_has_dsp) {
ret = -EIO;
case DSP_CONTROL:
if (!cpu_has_dsp) {
ret = -EIO;
@@
-381,7
+383,7
@@
asmlinkage int sys32_ptrace(int request, int pid, int addr, int data)
break;
case PTRACE_GET_THREAD_AREA:
break;
case PTRACE_GET_THREAD_AREA:
- ret = put_user(
child->thread_info
->tp_value,
+ ret = put_user(
task_thread_info(child)
->tp_value,
(unsigned int __user *) (unsigned long) data);
break;
(unsigned int __user *) (unsigned long) data);
break;
@@
-395,7
+397,7
@@
asmlinkage int sys32_ptrace(int request, int pid, int addr, int data)
break;
case PTRACE_GET_THREAD_AREA_3264:
break;
case PTRACE_GET_THREAD_AREA_3264:
- ret = put_user(
child->thread_info
->tp_value,
+ ret = put_user(
task_thread_info(child)
->tp_value,
(unsigned long __user *) (unsigned long) data);
break;
(unsigned long __user *) (unsigned long) data);
break;