Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 261bb920 authored by Namhyung Kim's avatar Namhyung Kim Committed by Linus Torvalds
Browse files

ptrace: cleanup arch_ptrace() on mn10300 



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: default avatarNamhyung Kim <namhyung@gmail.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Koichi Yasutake <yasutake.koichi@jp.panasonic.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fb671139

arch/mn10300/kernel/ptrace.c

+8 −9
Original line number Diff line number Diff line
@@ -300,27 +300,26 @@ long arch_ptrace(struct task_struct *child, long request, 
{

	unsigned long tmp;

	int ret;

	unsigned long __user *datap = (unsigned long __user *) data;



	switch (request) {

	/* read the word at location addr in the USER area. */

	case PTRACE_PEEKUSR:

		ret = -EIO;

		if ((addr & 3) || addr < 0 ||

		    addr > sizeof(struct user) - 3)

		if ((addr & 3) || addr > sizeof(struct user) - 3)

			break;



		tmp = 0;  /* Default return condition */

		if (addr < NR_PTREGS << 2)

			tmp = get_stack_long(child,

					     ptrace_regid_to_frame[addr]);

		ret = put_user(tmp, (unsigned long *) data);

		ret = put_user(tmp, datap);

		break;



		/* write the word at location addr in the USER area */

	case PTRACE_POKEUSR:

		ret = -EIO;

		if ((addr & 3) || addr < 0 ||

		    addr > sizeof(struct user) - 3)

		if ((addr & 3) || addr > sizeof(struct user) - 3)

			break;



		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,

					   REGSET_GENERAL,

					   0, NR_PTREGS * sizeof(long),

					   (void __user *)data);

					   datap);



	case PTRACE_SETREGS:	/* Set all integer regs in the child. */

		return copy_regset_from_user(child, &user_mn10300_native_view,

					     REGSET_GENERAL,

					     0, NR_PTREGS * sizeof(long),

					     (const void __user *)data);

					     datap);



	case PTRACE_GETFPREGS:	/* Get the child FPU state. */

		return copy_regset_to_user(child, &user_mn10300_native_view,

					   REGSET_FPU,

					   0, sizeof(struct fpu_state_struct),

					   (void __user *)data);

					   datap);



	case PTRACE_SETFPREGS:	/* Set the child FPU state. */

		return copy_regset_from_user(child, &user_mn10300_native_view,

					     REGSET_FPU,

					     0, sizeof(struct fpu_state_struct),

					     (const void __user *)data);

					     datap);



	default:

		ret = ptrace_request(child, request, addr, data);