diff options
author | Anirban Sinha <ASinha@zeugmasystems.com> | 2008-11-13 14:50:12 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2009-01-11 04:57:19 -0500 |
commit | 797c3f322454f5994e88b0e0bfc34cd4ad521d38 (patch) | |
tree | bdd716073199a59970952ff7c6b780a0a84490f5 | |
parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) |
MIPS: 64-bit: Use generic 32-bit ptrace compat code.
Signed-off-by: Anirban Sinha <asinha@zeugmasystems.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | arch/mips/kernel/ptrace32.c | 64 |
1 files changed, 1 insertions, 63 deletions
diff --git a/arch/mips/kernel/ptrace32.c b/arch/mips/kernel/ptrace32.c index 1ca34104e593..c4f9ac17474a 100644 --- a/arch/mips/kernel/ptrace32.c +++ b/arch/mips/kernel/ptrace32.c | |||
@@ -49,19 +49,6 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request, | |||
49 | int ret; | 49 | int ret; |
50 | 50 | ||
51 | switch (request) { | 51 | switch (request) { |
52 | /* when I and D space are separate, these will need to be fixed. */ | ||
53 | case PTRACE_PEEKTEXT: /* read word at location addr. */ | ||
54 | case PTRACE_PEEKDATA: { | ||
55 | unsigned int tmp; | ||
56 | int copied; | ||
57 | |||
58 | copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0); | ||
59 | ret = -EIO; | ||
60 | if (copied != sizeof(tmp)) | ||
61 | break; | ||
62 | ret = put_user(tmp, (unsigned int __user *) (unsigned long) data); | ||
63 | break; | ||
64 | } | ||
65 | 52 | ||
66 | /* | 53 | /* |
67 | * Read 4 bytes of the other process' storage | 54 | * Read 4 bytes of the other process' storage |
@@ -208,16 +195,6 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request, | |||
208 | break; | 195 | break; |
209 | } | 196 | } |
210 | 197 | ||
211 | /* when I and D space are separate, this will have to be fixed. */ | ||
212 | case PTRACE_POKETEXT: /* write the word at location addr. */ | ||
213 | case PTRACE_POKEDATA: | ||
214 | ret = 0; | ||
215 | if (access_process_vm(child, addr, &data, sizeof(data), 1) | ||
216 | == sizeof(data)) | ||
217 | break; | ||
218 | ret = -EIO; | ||
219 | break; | ||
220 | |||
221 | /* | 198 | /* |
222 | * Write 4 bytes into the other process' storage | 199 | * Write 4 bytes into the other process' storage |
223 | * data is the 4 bytes that the user wants written | 200 | * data is the 4 bytes that the user wants written |
@@ -332,50 +309,11 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request, | |||
332 | ret = ptrace_setfpregs(child, (__u32 __user *) (__u64) data); | 309 | ret = ptrace_setfpregs(child, (__u32 __user *) (__u64) data); |
333 | break; | 310 | break; |
334 | 311 | ||
335 | case PTRACE_SYSCALL: /* continue and stop at next (return from) syscall */ | ||
336 | case PTRACE_CONT: { /* restart after signal. */ | ||
337 | ret = -EIO; | ||
338 | if (!valid_signal(data)) | ||
339 | break; | ||
340 | if (request == PTRACE_SYSCALL) { | ||
341 | set_tsk_thread_flag(child, TIF_SYSCALL_TRACE); | ||
342 | } | ||
343 | else { | ||
344 | clear_tsk_thread_flag(child, TIF_SYSCALL_TRACE); | ||
345 | } | ||
346 | child->exit_code = data; | ||
347 | wake_up_process(child); | ||
348 | ret = 0; | ||
349 | break; | ||
350 | } | ||
351 | |||
352 | /* | ||
353 | * make the child exit. Best I can do is send it a sigkill. | ||
354 | * perhaps it should be put in the status that it wants to | ||
355 | * exit. | ||
356 | */ | ||
357 | case PTRACE_KILL: | ||
358 | ret = 0; | ||
359 | if (child->exit_state == EXIT_ZOMBIE) /* already dead */ | ||
360 | break; | ||
361 | child->exit_code = SIGKILL; | ||
362 | wake_up_process(child); | ||
363 | break; | ||
364 | |||
365 | case PTRACE_GET_THREAD_AREA: | 312 | case PTRACE_GET_THREAD_AREA: |
366 | ret = put_user(task_thread_info(child)->tp_value, | 313 | ret = put_user(task_thread_info(child)->tp_value, |
367 | (unsigned int __user *) (unsigned long) data); | 314 | (unsigned int __user *) (unsigned long) data); |
368 | break; | 315 | break; |
369 | 316 | ||
370 | case PTRACE_DETACH: /* detach a process that was attached. */ | ||
371 | ret = ptrace_detach(child, data); | ||
372 | break; | ||
373 | |||
374 | case PTRACE_GETEVENTMSG: | ||
375 | ret = put_user(child->ptrace_message, | ||
376 | (unsigned int __user *) (unsigned long) data); | ||
377 | break; | ||
378 | |||
379 | case PTRACE_GET_THREAD_AREA_3264: | 317 | case PTRACE_GET_THREAD_AREA_3264: |
380 | ret = put_user(task_thread_info(child)->tp_value, | 318 | ret = put_user(task_thread_info(child)->tp_value, |
381 | (unsigned long __user *) (unsigned long) data); | 319 | (unsigned long __user *) (unsigned long) data); |
@@ -392,7 +330,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request, | |||
392 | break; | 330 | break; |
393 | 331 | ||
394 | default: | 332 | default: |
395 | ret = ptrace_request(child, request, addr, data); | 333 | ret = compat_ptrace_request(child, request, addr, data); |
396 | break; | 334 | break; |
397 | } | 335 | } |
398 | out: | 336 | out: |