Skip to content

Commit

Permalink
ptrace: cleanup ptrace_request()
Browse files Browse the repository at this point in the history
Use new 'datavp' and 'datalp' variables to remove unnecesary castings.

Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Acked-by: Roland McGrath <roland@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
namhyung authored and torvalds committed Oct 28, 2010
1 parent 4abf986 commit 9fed81d
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions kernel/ptrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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);
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 9fed81d

Please sign in to comment.