Commit 9c1a1259 authored by Mike Frysinger's avatar Mike Frysinger Committed by Linus Torvalds
Browse files

ptrace: unify FDPIC implementations 



The Blackfin/FRV/SuperH guys all have the same exact FDPIC ptrace code in
their arch handlers (since they were probably copied & pasted).  Since
these ptrace interfaces are an arch independent aspect of the FDPIC code,
unify them in the common ptrace code so new FDPIC ports don't need to copy
and paste this fundamental stuff yet again.

Signed-off-by: default avatarMike Frysinger <vapier@gentoo.org>
Acked-by: default avatarRoland McGrath <roland@redhat.com>
Acked-by: default avatarDavid Howells <dhowells@redhat.com>
Acked-by: default avatarPaul Mundt <lethal@linux-sh.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0ac0c0d0

arch/blackfin/kernel/ptrace.c

+9 −24
Original line number Original line Diff line number Diff line
@@ -292,28 +292,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) 
			break;

			break;

		}

		}





#ifdef CONFIG_BINFMT_ELF_FDPIC

	case PTRACE_GETFDPIC: {

		unsigned long tmp = 0;



		switch (addr) {

		case_PTRACE_GETFDPIC_EXEC:

		case PTRACE_GETFDPIC_EXEC:

			tmp = child->mm->context.exec_fdpic_loadmap;

			break;

		case_PTRACE_GETFDPIC_INTERP:

		case PTRACE_GETFDPIC_INTERP:

			tmp = child->mm->context.interp_fdpic_loadmap;

			break;

		default:

			break;

		}



		ret = put_user(tmp, datap);

		break;

	}

#endif



		/* when I and D space are separate, this will have to be fixed. */

		/* when I and D space are separate, this will have to be fixed. */

	case PTRACE_POKEDATA:

	case PTRACE_POKEDATA:

		pr_debug("ptrace: PTRACE_PEEKDATA\n");

		pr_debug("ptrace: PTRACE_PEEKDATA\n");
@@ -357,8 +335,14 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) 
	case PTRACE_PEEKUSR:

	case PTRACE_PEEKUSR:

		switch (addr) {

		switch (addr) {

#ifdef CONFIG_BINFMT_ELF_FDPIC	/* backwards compat */

#ifdef CONFIG_BINFMT_ELF_FDPIC	/* backwards compat */

		case PT_FDPIC_EXEC:   goto case_PTRACE_GETFDPIC_EXEC;

		case PT_FDPIC_EXEC:

		case PT_FDPIC_INTERP: goto case_PTRACE_GETFDPIC_INTERP;

			request = PTRACE_GETFDPIC;

			addr = PTRACE_GETFDPIC_EXEC;

			goto case_default;

		case PT_FDPIC_INTERP:

			request = PTRACE_GETFDPIC;

			addr = PTRACE_GETFDPIC_INTERP;

			goto case_default;

#endif

#endif

		default:

		default:

			ret = get_reg(child, addr, datap);

			ret = get_reg(child, addr, datap);
@@ -385,6 +369,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) 
					     0, sizeof(struct pt_regs),

					     0, sizeof(struct pt_regs),

					     (const void __user *)data);

					     (const void __user *)data);





	case_default:

	default:

	default:

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

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

		break;

		break;

arch/frv/kernel/ptrace.c

+0 −20
Original line number Original line Diff line number Diff line
@@ -344,26 +344,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) 
					     0, sizeof(child->thread.user->f),

					     0, sizeof(child->thread.user->f),

					     (const void __user *)data);

					     (const void __user *)data);





	case PTRACE_GETFDPIC:

		tmp = 0;

		switch (addr) {

		case PTRACE_GETFDPIC_EXEC:

			tmp = child->mm->context.exec_fdpic_loadmap;

			break;

		case PTRACE_GETFDPIC_INTERP:

			tmp = child->mm->context.interp_fdpic_loadmap;

			break;

		default:

			break;

		}



		ret = 0;

		if (put_user(tmp, (unsigned long *) data)) {

			ret = -EFAULT;

			break;

		}

		break;



	default:

	default:

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

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

		break;

		break;

arch/sh/kernel/ptrace_32.c

+0 −23
Original line number Original line Diff line number Diff line
@@ -435,29 +435,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) 
					     REGSET_DSP,

					     REGSET_DSP,

					     0, sizeof(struct pt_dspregs),

					     0, sizeof(struct pt_dspregs),

					     (const void __user *)data);

					     (const void __user *)data);

#endif

#ifdef CONFIG_BINFMT_ELF_FDPIC

	case PTRACE_GETFDPIC: {

		unsigned long tmp = 0;



		switch (addr) {

		case PTRACE_GETFDPIC_EXEC:

			tmp = child->mm->context.exec_fdpic_loadmap;

			break;

		case PTRACE_GETFDPIC_INTERP:

			tmp = child->mm->context.interp_fdpic_loadmap;

			break;

		default:

			break;

		}



		ret = 0;

		if (put_user(tmp, datap)) {

			ret = -EFAULT;

			break;

		}

		break;

	}

#endif

#endif

	default:

	default:

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

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

kernel/ptrace.c

+20 −0
Original line number Original line Diff line number Diff line
@@ -594,6 +594,26 @@ int ptrace_request(struct task_struct *child, long request, 
		ret = ptrace_detach(child, data);

		ret = ptrace_detach(child, data);

		break;

		break;





#ifdef CONFIG_BINFMT_ELF_FDPIC

	case PTRACE_GETFDPIC: {

		unsigned long tmp = 0;



		switch (addr) {

		case PTRACE_GETFDPIC_EXEC:

			tmp = child->mm->context.exec_fdpic_loadmap;

			break;

		case PTRACE_GETFDPIC_INTERP:

			tmp = child->mm->context.interp_fdpic_loadmap;

			break;

		default:

			break;

		}



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

		break;

	}

#endif



#ifdef PTRACE_SINGLESTEP

#ifdef PTRACE_SINGLESTEP

	case PTRACE_SINGLESTEP:

	case PTRACE_SINGLESTEP:

#endif

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE