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

Commit 81e695c0 authored by Roland McGrath's avatar Roland McGrath Committed by Paul Mackerras
Browse files

[POWERPC] Use generic compat_sys_ptrace 



This replaces powerpc's compat_sys_ptrace with a compat_arch_ptrace and
enables the new generic definition of compat_sys_ptrace instead.

Signed-off-by: default avatarRoland McGrath <roland@redhat.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 1d48d71c

arch/powerpc/kernel/ptrace32.c

+5 −28
Original line number Diff line number Diff line
@@ -85,33 +85,13 @@ static long compat_ptrace_old(struct task_struct *child, long request, 
	return ret;

}



long compat_sys_ptrace(int request, int pid, unsigned long addr,

		       unsigned long data)

long compat_arch_ptrace(struct task_struct *child, compat_long_t request,

			compat_ulong_t caddr, compat_ulong_t cdata)

{

	struct task_struct *child;

	unsigned long addr = caddr;

	unsigned long data = cdata;

	int ret;



	lock_kernel();

	if (request == PTRACE_TRACEME) {

		ret = ptrace_traceme();

		goto out;

	}



	child = ptrace_get_task_struct(pid);

	if (IS_ERR(child)) {

		ret = PTR_ERR(child);

		goto out;

	}



	if (request == PTRACE_ATTACH) {

		ret = ptrace_attach(child);

		goto out_tsk;

	}



	ret = ptrace_check_attach(child, request == PTRACE_KILL);

	if (ret < 0)

		goto out_tsk;



	switch (request) {

	/*

	 * Read 4 bytes of the other process' storage
@@ -375,9 +355,6 @@ long compat_sys_ptrace(int request, int pid, unsigned long addr, 
		ret = compat_ptrace_request(child, request, addr, data);

		break;

	}

out_tsk:

	put_task_struct(child);

out:

	unlock_kernel();



	return ret;

}

include/asm-powerpc/ptrace.h

+2 −0
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ struct pt_regs { 


#ifdef __powerpc64__



#define __ARCH_WANT_COMPAT_SYS_PTRACE



#define STACK_FRAME_OVERHEAD	112	/* size of minimum stack frame */



/* Size of dummy stack frame allocated when calling signal handler. */