patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / arch / ppc64 / kernel / ptrace32.c

diff --git a/arch/ppc64/kernel/ptrace32.c b/arch/ppc64/kernel/ptrace32.c
index 3309bf2..309db1c 100644 (file)
--- a/arch/ppc64/kernel/ptrace32.c
+++ b/arch/ppc64/kernel/ptrace32.c
@@ -89,7 +89,7 @@ int sys32_ptrace(long request, long pid, unsigned long addr, unsigned long data)
                ret = -EIO;
                if (copied != sizeof(tmp))
                        break;
-               ret = put_user(tmp, (u32*)data);
+               ret = put_user(tmp, (u32 __user *)data);
                break;
        }
 
@@ -106,19 +106,19 @@ int sys32_ptrace(long request, long pid, unsigned long addr, unsigned long data)
        case PPC_PTRACE_PEEKDATA_3264: {
                u32 tmp;
                int copied;
-               u32* addrOthers;
+               u32 __user * addrOthers;
 
                ret = -EIO;
 
                /* Get the addr in the other process that we want to read */
-               if (get_user(addrOthers, (u32**)addr) != 0)
+               if (get_user(addrOthers, (u32 __user * __user *)addr) != 0)
                        break;
 
                copied = access_process_vm(child, (u64)addrOthers, &tmp,
                                sizeof(tmp), 0);
                if (copied != sizeof(tmp))
                        break;
-               ret = put_user(tmp, (u32*)data);
+               ret = put_user(tmp, (u32 __user *)data);
                break;
        }
 
@@ -145,7 +145,7 @@ int sys32_ptrace(long request, long pid, unsigned long addr, unsigned long data)
                         */
                        tmp = ((unsigned int *)child->thread.fpr)[index - PT_FPR0];
                }
-               ret = put_user((unsigned int)tmp, (u32*)data);
+               ret = put_user((unsigned int)tmp, (u32 __user *)data);
                break;
        }
   
@@ -186,7 +186,7 @@ int sys32_ptrace(long request, long pid, unsigned long addr, unsigned long data)
                        tmp = get_reg(child, numReg);
                } 
                reg32bits = ((u32*)&tmp)[part];
-               ret = put_user(reg32bits, (u32*)data);
+               ret = put_user(reg32bits, (u32 __user *)data);
                break;
        }
 
@@ -215,11 +215,11 @@ int sys32_ptrace(long request, long pid, unsigned long addr, unsigned long data)
        case PPC_PTRACE_POKETEXT_3264:
        case PPC_PTRACE_POKEDATA_3264: {
                u32 tmp = data;
-               u32* addrOthers;
+               u32 __user * addrOthers;
 
                /* Get the addr in the other process that we want to write into */
                ret = -EIO;
-               if (get_user(addrOthers, (u32**)addr) != 0)
+               if (get_user(addrOthers, (u32 __user * __user *)addr) != 0)
                        break;
                ret = 0;
                if (access_process_vm(child, (u64)addrOthers, &tmp,
@@ -347,7 +347,7 @@ int sys32_ptrace(long request, long pid, unsigned long addr, unsigned long data)
        case PPC_PTRACE_GETREGS: { /* Get GPRs 0 - 31. */
                int i;
                unsigned long *reg = &((unsigned long *)child->thread.regs)[0];
-               unsigned int *tmp = (unsigned int *)addr;
+               unsigned int __user *tmp = (unsigned int __user *)addr;
 
                for (i = 0; i < 32; i++) {
                        ret = put_user(*reg, tmp);
@@ -362,7 +362,7 @@ int sys32_ptrace(long request, long pid, unsigned long addr, unsigned long data)
        case PPC_PTRACE_SETREGS: { /* Set GPRs 0 - 31. */
                int i;
                unsigned long *reg = &((unsigned long *)child->thread.regs)[0];
-               unsigned int *tmp = (unsigned int *)addr;
+               unsigned int __user *tmp = (unsigned int __user *)addr;
 
                for (i = 0; i < 32; i++) {
                        ret = get_user(*reg, tmp);
@@ -377,7 +377,7 @@ int sys32_ptrace(long request, long pid, unsigned long addr, unsigned long data)
        case PPC_PTRACE_GETFPREGS: { /* Get FPRs 0 - 31. */
                int i;
                unsigned long *reg = &((unsigned long *)child->thread.fpr)[0];
-               unsigned int *tmp = (unsigned int *)addr;
+               unsigned int __user *tmp = (unsigned int __user *)addr;
 
                if (child->thread.regs->msr & MSR_FP)
                        giveup_fpu(child);
@@ -395,7 +395,7 @@ int sys32_ptrace(long request, long pid, unsigned long addr, unsigned long data)
        case PPC_PTRACE_SETFPREGS: { /* Get FPRs 0 - 31. */
                int i;
                unsigned long *reg = &((unsigned long *)child->thread.fpr)[0];
-               unsigned int *tmp = (unsigned int *)addr;
+               unsigned int __user *tmp = (unsigned int __user *)addr;
 
                if (child->thread.regs->msr & MSR_FP)
                        giveup_fpu(child);