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

Commit f284ce72 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Linus Torvalds
Browse files

PTRACE_POKEDATA consolidation 



Identical implementations of PTRACE_POKEDATA go into generic_ptrace_pokedata()
function.

AFAICS, fix bug on xtensa where successful PTRACE_POKEDATA will nevertheless
return EPERM.

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 76647323

arch/alpha/kernel/ptrace.c

+1 −3
Original line number Diff line number Diff line
@@ -315,9 +315,7 @@ do_sys_ptrace(long request, long pid, long addr, long data, 
	/* When I and D space are separate, this will have to be fixed.  */

	case PTRACE_POKETEXT: /* write the word at location addr. */

	case PTRACE_POKEDATA:

		tmp = data;

		copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 1);

		ret = (copied == sizeof(tmp)) ? 0 : -EIO;

		ret = generic_ptrace_pokedata(child, addr, data);

		break;



	case PTRACE_POKEUSR: /* write the specified register */

arch/arm/kernel/ptrace.c

+1 −6
Original line number Diff line number Diff line
@@ -677,12 +677,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) 
		 */

		case PTRACE_POKETEXT:

		case PTRACE_POKEDATA:

			ret = access_process_vm(child, addr, &data,

						sizeof(unsigned long), 1);

			if (ret == sizeof(unsigned long))

				ret = 0;

			else

				ret = -EIO;

			ret = generic_ptrace_pokedata(child, addr, data);

			break;



		case PTRACE_POKEUSR:

arch/arm26/kernel/ptrace.c

+1 −6
Original line number Diff line number Diff line
@@ -551,12 +551,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) 
		 */

		case PTRACE_POKETEXT:

		case PTRACE_POKEDATA:

			ret = access_process_vm(child, addr, &data,

						sizeof(unsigned long), 1);

			if (ret == sizeof(unsigned long))

				ret = 0;

			else

				ret = -EIO;

			ret = generic_ptrace_pokedata(child, addr, data);

			break;



		case PTRACE_POKEUSR:

arch/avr32/kernel/ptrace.c

+1 −5
Original line number Diff line number Diff line
@@ -176,11 +176,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) 
	/* Write the word in data at location addr */

	case PTRACE_POKETEXT:

	case PTRACE_POKEDATA:

		ret = access_process_vm(child, addr, &data, sizeof(data), 1);

		if (ret == sizeof(data))

			ret = 0;

		else

			ret = -EIO;

		ret = generic_ptrace_pokedata(child, addr, data);

		break;



	case PTRACE_POKEUSR:

arch/cris/arch-v10/kernel/ptrace.c

+1 −6
Original line number Diff line number Diff line
@@ -103,12 +103,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) 
		/* Write the word at location address. */

		case PTRACE_POKETEXT:

		case PTRACE_POKEDATA:

			ret = 0;

			

			if (access_process_vm(child, addr, &data, sizeof(data), 1) == sizeof(data))

				break;

			

			ret = -EIO;

			ret = generic_ptrace_pokedata(child, addr, data);

			break;

 

 		/* Write the word at location address in the USER area. */