Messages in this thread Patch in this message | | | From | Namhyung Kim <> | Subject | [PATCH v2 02/24] ptrace: cleanup ptrace_request() | Date | Fri, 3 Sep 2010 00:46:09 +0900 |
| |
use new local variable to remove unnecesary casting, but it requires put_user() to be changed to copy_to_user().
Signed-off-by: Namhyung Kim <namhyung@gmail.com> --- kernel/ptrace.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/kernel/ptrace.c b/kernel/ptrace.c index f838afe..1084bef 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c @@ -563,6 +563,7 @@ int ptrace_request(struct task_struct *child, long request, { int ret = -EIO; siginfo_t siginfo; + void __user *datap = (void __user *) data; switch (request) { case PTRACE_PEEKTEXT: @@ -579,19 +580,19 @@ 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 = copy_to_user(datap, &child->ptrace_message, + sizeof (child->ptrace_message)) ? + -EFAULT : 0; 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(datap, &siginfo); break; case PTRACE_SETSIGINFO: - if (copy_from_user(&siginfo, (siginfo_t __user *) data, - sizeof siginfo)) + if (copy_from_user(&siginfo, datap, sizeof siginfo)) ret = -EFAULT; else ret = ptrace_setsiginfo(child, &siginfo); @@ -622,7 +623,7 @@ int ptrace_request(struct task_struct *child, long request, } mmput(mm); - ret = put_user(tmp, (unsigned long __user *) data); + ret = copy_to_user(datap, &tmp, sizeof tmp) ? -EFAULT : 0; break; } #endif -- 1.7.2.2
| |