Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-15 01:44:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ptrace: cleanup arch_ptrace() on mn10300

Browse Source 
Use new 'datap' variable in order to remove unnecessary castings.
Also remove checking @addr less than 0 because @addr is now unsigned.

Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Koichi Yasutake <yasutake.koichi@jp.panasonic.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Namhyung Kim 2010-10-27 15:33:58 -07:00 committed by Linus Torvalds
parent fb671139a2
commit 261bb92054
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arch/mn10300/kernel/ptrace.c
View File

@ -300,27 +300,26 @@ long arch_ptrace(struct task_struct *child, long request,
{ {
unsigned long tmp; unsigned long tmp;
int ret; int ret;
unsigned long __user *datap = (unsigned long __user *) data;
switch (request) { switch (request) {
/* read the word at location addr in the USER area. */ /* read the word at location addr in the USER area. */
case PTRACE_PEEKUSR: case PTRACE_PEEKUSR:
ret = -EIO; ret = -EIO;
if ((addr & 3) || addr < 0 || if ((addr & 3) || addr > sizeof(struct user) - 3)
addr > sizeof(struct user) - 3)
break; break;
tmp = 0; /* Default return condition */ tmp = 0; /* Default return condition */
if (addr < NR_PTREGS << 2) if (addr < NR_PTREGS << 2)
tmp = get_stack_long(child, tmp = get_stack_long(child,
ptrace_regid_to_frame[addr]); ptrace_regid_to_frame[addr]);
ret = put_user(tmp, (unsigned long *) data); ret = put_user(tmp, datap);
break; break;
/* write the word at location addr in the USER area */ /* write the word at location addr in the USER area */
case PTRACE_POKEUSR: case PTRACE_POKEUSR:
ret = -EIO; ret = -EIO;
if ((addr & 3) || addr < 0 || if ((addr & 3) || addr > sizeof(struct user) - 3)
addr > sizeof(struct user) - 3)
break; break;
ret = 0; ret = 0;
@ -333,25 +332,25 @@ long arch_ptrace(struct task_struct *child, long request,
return copy_regset_to_user(child, &user_mn10300_native_view, return copy_regset_to_user(child, &user_mn10300_native_view,
REGSET_GENERAL, REGSET_GENERAL,
0, NR_PTREGS * sizeof(long), 0, NR_PTREGS * sizeof(long),
(void __user *)data); datap);
case PTRACE_SETREGS: /* Set all integer regs in the child. */ case PTRACE_SETREGS: /* Set all integer regs in the child. */
return copy_regset_from_user(child, &user_mn10300_native_view, return copy_regset_from_user(child, &user_mn10300_native_view,
REGSET_GENERAL, REGSET_GENERAL,
0, NR_PTREGS * sizeof(long), 0, NR_PTREGS * sizeof(long),
(const void __user *)data); datap);
case PTRACE_GETFPREGS: /* Get the child FPU state. */ case PTRACE_GETFPREGS: /* Get the child FPU state. */
return copy_regset_to_user(child, &user_mn10300_native_view, return copy_regset_to_user(child, &user_mn10300_native_view,
REGSET_FPU, REGSET_FPU,
0, sizeof(struct fpu_state_struct), 0, sizeof(struct fpu_state_struct),
(void __user *)data); datap);
case PTRACE_SETFPREGS: /* Set the child FPU state. */ case PTRACE_SETFPREGS: /* Set the child FPU state. */
return copy_regset_from_user(child, &user_mn10300_native_view, return copy_regset_from_user(child, &user_mn10300_native_view,
REGSET_FPU, REGSET_FPU,
0, sizeof(struct fpu_state_struct), 0, sizeof(struct fpu_state_struct),
(const void __user *)data); datap);
default: default:
ret = ptrace_request(child, request, addr, data); ret = ptrace_request(child, request, addr, data);