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

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

PTRACE_PEEKDATA consolidation 



Identical implementations of PTRACE_PEEKDATA go into generic_ptrace_peekdata()
function.

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 bcdcd8e7

arch/arm/kernel/ptrace.c

+1 −7
Original line number Diff line number Diff line
@@ -657,7 +657,6 @@ static int ptrace_setcrunchregs(struct task_struct *tsk, void __user *ufp) 


long arch_ptrace(struct task_struct *child, long request, long addr, long data)

{

	unsigned long tmp;

	int ret;



	switch (request) {
@@ -666,12 +665,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) 
		 */

		case PTRACE_PEEKTEXT:

		case PTRACE_PEEKDATA:

			ret = access_process_vm(child, addr, &tmp,

						sizeof(unsigned long), 0);

			if (ret == sizeof(unsigned long))

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

			else

				ret = -EIO;

			ret = generic_ptrace_peekdata(child, addr, data);

			break;



		case PTRACE_PEEKUSR:

arch/arm26/kernel/ptrace.c

+1 −7
Original line number Diff line number Diff line
@@ -531,7 +531,6 @@ static int ptrace_setfpregs(struct task_struct *tsk, void *ufp) 


long arch_ptrace(struct task_struct *child, long request, long addr, long data)

{

	unsigned long tmp;

	int ret;



	switch (request) {
@@ -540,12 +539,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) 
		 */

		case PTRACE_PEEKTEXT:

		case PTRACE_PEEKDATA:

			ret = access_process_vm(child, addr, &tmp,

						sizeof(unsigned long), 0);

			if (ret == sizeof(unsigned long))

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

			else

				ret = -EIO;

			ret = generic_ptrace_peekdata(child, addr, data);

			break;



		case PTRACE_PEEKUSR:

arch/avr32/kernel/ptrace.c

+1 −6
Original line number Diff line number Diff line
@@ -153,7 +153,6 @@ static int ptrace_setregs(struct task_struct *tsk, const void __user *uregs) 


long arch_ptrace(struct task_struct *child, long request, long addr, long data)

{

	unsigned long tmp;

	int ret;



	pr_debug("arch_ptrace(%ld, %d, %#lx, %#lx)\n",
@@ -166,11 +165,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) 
	/* Read the word at location addr in the child process */

	case PTRACE_PEEKTEXT:

	case PTRACE_PEEKDATA:

		ret = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);

		if (ret == sizeof(tmp))

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

		else

			ret = -EIO;

		ret = generic_ptrace_peekdata(child, addr, data);

		break;



	case PTRACE_PEEKUSR:

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

+2 −12
Original line number Diff line number Diff line
@@ -83,20 +83,10 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) 
	switch (request) {

		/* Read word at location address. */ 

		case PTRACE_PEEKTEXT:

		case PTRACE_PEEKDATA: {

			unsigned long tmp;

			int copied;



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

			ret = -EIO;

			

			if (copied != sizeof(tmp))

		case PTRACE_PEEKDATA:

			ret = generic_ptrace_peekdata(child, addr, data);

			break;



			ret = put_user(tmp,datap);

			break;

		}



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

		case PTRACE_PEEKUSR: {

			unsigned long tmp;

arch/frv/kernel/ptrace.c

+2 −10
Original line number Diff line number Diff line
@@ -112,20 +112,12 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) 
	switch (request) {

		/* when I and D space are separate, these will need to be fixed. */

	case PTRACE_PEEKTEXT: /* read word at location addr. */

	case PTRACE_PEEKDATA: {

		int copied;



	case PTRACE_PEEKDATA:

		ret = -EIO;

		if (is_user_addr_valid(child, addr, sizeof(tmp)) < 0)

			break;



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

		if (copied != sizeof(tmp))

			break;



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

		ret = generic_ptrace_peekdata(child, addr, data);

		break;

	}



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

	case PTRACE_PEEKUSR: {