[RFC PATCH 05/43] ptrace, x86: cleanup arch_ptrace()
From: Namhyung Kim
Date: Fri Aug 27 2010 - 05:50:54 EST
change type of 'datap' variable into void pointer in order to remove
unnecessary castings.
Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxxxxx>
Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
---
arch/x86/kernel/ptrace.c | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
index ea7766a..29c17610 100644
--- a/arch/x86/kernel/ptrace.c
+++ b/arch/x86/kernel/ptrace.c
@@ -805,7 +805,7 @@ long arch_ptrace(struct task_struct *child, long request,
unsigned long addr, unsigned long data)
{
int ret;
- unsigned long __user *datap = (unsigned long __user *)data;
+ void __user *datap = (void __user *)data;
switch (request) {
/* read the word at location addr in the USER area. */
@@ -824,7 +824,7 @@ long arch_ptrace(struct task_struct *child, long request,
addr -= offsetof(struct user, u_debugreg[0]);
tmp = ptrace_get_debugreg(child, addr / sizeof(data));
}
- ret = put_user(tmp, datap);
+ ret = copy_to_user(datap, &tmp, sizeof(tmp)) ? -EFAULT : 0;
break;
}
@@ -889,15 +889,13 @@ long arch_ptrace(struct task_struct *child, long request,
case PTRACE_GET_THREAD_AREA:
if ((int) addr < 0)
return -EIO;
- ret = do_get_thread_area(child, addr,
- (struct user_desc __user *) data);
+ ret = do_get_thread_area(child, addr, datap);
break;
case PTRACE_SET_THREAD_AREA:
if ((int) addr < 0)
return -EIO;
- ret = do_set_thread_area(child, addr,
- (struct user_desc __user *) data, 0);
+ ret = do_set_thread_area(child, addr, datap, 0);
break;
#endif
--
1.7.2.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/