Skip to content

Commit

Permalink
[POWERPC] Use generic compat_sys_ptrace
Browse files Browse the repository at this point in the history
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: Roland McGrath <roland@redhat.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Roland McGrath authored and Paul Mackerras committed Feb 7, 2008
1 parent 1d48d71 commit 81e695c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 28 deletions.
33 changes: 5 additions & 28 deletions arch/powerpc/kernel/ptrace32.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
}
2 changes: 2 additions & 0 deletions include/asm-powerpc/ptrace.h
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down

0 comments on commit 81e695c

Please sign in to comment.