|
@@ -565,6 +565,8 @@ int ptrace_request(struct task_struct *child, long request,
|
|
|
{
|
|
|
int ret = -EIO;
|
|
|
siginfo_t siginfo;
|
|
|
+ void __user *datavp = (void __user *) data;
|
|
|
+ unsigned long __user *datalp = datavp;
|
|
|
|
|
|
switch (request) {
|
|
|
case PTRACE_PEEKTEXT:
|
|
@@ -581,19 +583,17 @@ int ptrace_request(struct task_struct *child, long request,
|
|
|
ret = ptrace_setoptions(child, data);
|
|
|
break;
|
|
|
case PTRACE_GETEVENTMSG:
|
|
|
- ret = put_user(child->ptrace_message, (unsigned long __user *) data);
|
|
|
+ ret = put_user(child->ptrace_message, datalp);
|
|
|
break;
|
|
|
|
|
|
case PTRACE_GETSIGINFO:
|
|
|
ret = ptrace_getsiginfo(child, &siginfo);
|
|
|
if (!ret)
|
|
|
- ret = copy_siginfo_to_user((siginfo_t __user *) data,
|
|
|
- &siginfo);
|
|
|
+ ret = copy_siginfo_to_user(datavp, &siginfo);
|
|
|
break;
|
|
|
|
|
|
case PTRACE_SETSIGINFO:
|
|
|
- if (copy_from_user(&siginfo, (siginfo_t __user *) data,
|
|
|
- sizeof siginfo))
|
|
|
+ if (copy_from_user(&siginfo, datavp, sizeof siginfo))
|
|
|
ret = -EFAULT;
|
|
|
else
|
|
|
ret = ptrace_setsiginfo(child, &siginfo);
|
|
@@ -624,7 +624,7 @@ int ptrace_request(struct task_struct *child, long request,
|
|
|
}
|
|
|
mmput(mm);
|
|
|
|
|
|
- ret = put_user(tmp, (unsigned long __user *) data);
|
|
|
+ ret = put_user(tmp, datalp);
|
|
|
break;
|
|
|
}
|
|
|
#endif
|
|
@@ -653,7 +653,7 @@ int ptrace_request(struct task_struct *child, long request,
|
|
|
case PTRACE_SETREGSET:
|
|
|
{
|
|
|
struct iovec kiov;
|
|
|
- struct iovec __user *uiov = (struct iovec __user *) data;
|
|
|
+ struct iovec __user *uiov = datavp;
|
|
|
|
|
|
if (!access_ok(VERIFY_WRITE, uiov, sizeof(*uiov)))
|
|
|
return -EFAULT;
|