diff options
Diffstat (limited to 'arch/sh/kernel/ptrace.c')
| -rw-r--r-- | arch/sh/kernel/ptrace.c | 44 |
1 files changed, 2 insertions, 42 deletions
diff --git a/arch/sh/kernel/ptrace.c b/arch/sh/kernel/ptrace.c index 1fbe5a428e31..1a8be06519ec 100644 --- a/arch/sh/kernel/ptrace.c +++ b/arch/sh/kernel/ptrace.c | |||
| @@ -80,48 +80,11 @@ void ptrace_disable(struct task_struct *child) | |||
| 80 | /* nothing to do.. */ | 80 | /* nothing to do.. */ |
| 81 | } | 81 | } |
| 82 | 82 | ||
| 83 | asmlinkage long sys_ptrace(long request, long pid, long addr, long data) | 83 | long arch_ptrace(struct task_struct *child, long request, long addr, long data) |
| 84 | { | 84 | { |
| 85 | struct task_struct *child; | ||
| 86 | struct user * dummy = NULL; | 85 | struct user * dummy = NULL; |
| 87 | int ret; | 86 | int ret; |
| 88 | 87 | ||
| 89 | lock_kernel(); | ||
| 90 | ret = -EPERM; | ||
| 91 | if (request == PTRACE_TRACEME) { | ||
| 92 | /* are we already being traced? */ | ||
| 93 | if (current->ptrace & PT_PTRACED) | ||
| 94 | goto out; | ||
| 95 | ret = security_ptrace(current->parent, current); | ||
| 96 | if (ret) | ||
| 97 | goto out; | ||
| 98 | /* set the ptrace bit in the process flags. */ | ||
| 99 | current->ptrace |= PT_PTRACED; | ||
| 100 | ret = 0; | ||
| 101 | goto out; | ||
| 102 | } | ||
| 103 | ret = -ESRCH; | ||
| 104 | read_lock(&tasklist_lock); | ||
| 105 | child = find_task_by_pid(pid); | ||
| 106 | if (child) | ||
| 107 | get_task_struct(child); | ||
| 108 | read_unlock(&tasklist_lock); | ||
| 109 | if (!child) | ||
| 110 | goto out; | ||
| 111 | |||
| 112 | ret = -EPERM; | ||
| 113 | if (pid == 1) /* you may not mess with init */ | ||
| 114 | goto out_tsk; | ||
| 115 | |||
| 116 | if (request == PTRACE_ATTACH) { | ||
| 117 | ret = ptrace_attach(child); | ||
| 118 | goto out_tsk; | ||
| 119 | } | ||
| 120 | |||
| 121 | ret = ptrace_check_attach(child, request == PTRACE_KILL); | ||
| 122 | if (ret < 0) | ||
| 123 | goto out_tsk; | ||
| 124 | |||
| 125 | switch (request) { | 88 | switch (request) { |
| 126 | /* when I and D space are separate, these will need to be fixed. */ | 89 | /* when I and D space are separate, these will need to be fixed. */ |
| 127 | case PTRACE_PEEKTEXT: /* read word at location addr. */ | 90 | case PTRACE_PEEKTEXT: /* read word at location addr. */ |
| @@ -289,10 +252,7 @@ asmlinkage long sys_ptrace(long request, long pid, long addr, long data) | |||
| 289 | ret = ptrace_request(child, request, addr, data); | 252 | ret = ptrace_request(child, request, addr, data); |
| 290 | break; | 253 | break; |
| 291 | } | 254 | } |
| 292 | out_tsk: | 255 | |
| 293 | put_task_struct(child); | ||
| 294 | out: | ||
| 295 | unlock_kernel(); | ||
| 296 | return ret; | 256 | return ret; |
| 297 | } | 257 | } |
| 298 | 258 | ||
