Consolidate PTRACE_DETACH
Subsystems (12)
PATCH 1/1 Consolidate PTRACE_DETACH
Identical handlers of PTRACE_DETACH go into ptrace_request(). Not touching compat code.
Not touching archs that don't call ptrace_request.
Signed-off-by Alexey Dobriyan <[email protected]>
---
arch/alpha/kernel/ptrace.c | 4 ---- arch/arm/kernel/ptrace.c | 4 ---- arch/arm26/kernel/ptrace.c | 4 ---- arch/avr32/kernel/ptrace.c | 5 ----- arch/blackfin/kernel/ptrace.c | 6 ------ arch/cris/arch-v10/kernel/ptrace.c | 4 ---- arch/cris/arch-v32/kernel/ptrace.c | 4 ---- arch/i386/kernel/ptrace.c | 5 ----- arch/m32r/kernel/ptrace.c | 8 -------- arch/m68k/kernel/ptrace.c | 4 ---- arch/mips/kernel/ptrace.c | 4 ---- arch/parisc/kernel/ptrace.c | 4 ---- arch/powerpc/kernel/ptrace.c | 4 ---- arch/s390/kernel/ptrace.c | 5 ----- arch/sh/kernel/ptrace.c | 4 ---- arch/sh64/kernel/ptrace.c | 4 ---- arch/um/kernel/ptrace.c | 5 ----- arch/x86_64/kernel/ptrace.c | 5 ----- arch/xtensa/kernel/ptrace.c | 4 ---- kernel/ptrace.c | 3 +++ 20 files changed, 3 insertions(+), 87 deletions(-)
arch/alpha/kernel/ptrace.c +0 -4
@@ -368,10 +368,6 @@ do_sys_ptrace(long request, long pid, long addr, long data, ret =0 ; goto out; -case PTRACE_DETACH :/* detach a process that was attached. */ - ret =ptrace_detach (child, data); - goto out; -default : ret =ptrace_request (child, request, addr, data); goto out;
arch/arm/kernel/ptrace.c +0 -4
@@ -731,10 +731,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) ret =0 ;break ; -case PTRACE_DETACH : - ret =ptrace_detach (child, data); -break ; -case PTRACE_GETREGS : ret =ptrace_getregs (child, (void __user *)data);break ;
arch/arm26/kernel/ptrace.c +0 -4
@@ -609,10 +609,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) ret =0 ;break ; -case PTRACE_DETACH : - ret =ptrace_detach (child, data); -break ; -case PTRACE_GETREGS : ret =ptrace_getregs (child, (void *)data);break ;
arch/avr32/kernel/ptrace.c +0 -5
@@ -227,11 +227,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) ret =0 ;break ; -/* Detach a process that was attached */ -case PTRACE_DETACH : - ret =ptrace_detach (child, data); -break ; -case PTRACE_GETREGS : ret =ptrace_getregs (child, (void __user *)data);break ;
arch/blackfin/kernel/ptrace.c +0 -6
@@ -373,12 +373,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)break ; } -case PTRACE_DETACH : - {/* detach a process that was attached. */ - ret =ptrace_detach (child, data); -break ; - } -case PTRACE_GETREGS : {
arch/cris/arch-v10/kernel/ptrace.c +0 -4
@@ -177,10 +177,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) ret =0 ;break ; -case PTRACE_DETACH : - ret =ptrace_detach (child, data); -break ; -/* Get all GP registers from the child. */ case PTRACE_GETREGS : {int i;
arch/cris/arch-v32/kernel/ptrace.c +0 -4
@@ -245,10 +245,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)break ; } -case PTRACE_DETACH : - ret =ptrace_detach (child, data); -break ; -/* Get all GP registers from the child. */ case PTRACE_GETREGS : {int i;
arch/i386/kernel/ptrace.c +0 -5
@@ -526,11 +526,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) ret =0 ;break ; -case PTRACE_DETACH : -/* detach a process that was attached. */ - ret =ptrace_detach (child, data); -break ; -case PTRACE_GETREGS : {/* Get all gp regs from the child. */ if (!access_ok (VERIFY_WRITE , datap,FRAME_SIZE *sizeof (long ))) { ret = -EIO ;
arch/m32r/kernel/ptrace.c +0 -8
@@ -703,14 +703,6 @@ do_ptrace(long request, struct task_struct *child, long addr, long data)break ; } -/* -* detach a process that was attached. -*/ -case PTRACE_DETACH : - ret =0 ; - ret =ptrace_detach (child, data); -break ; -case PTRACE_GETREGS : ret =ptrace_getregs (child, (void __user *)data);break ;
arch/m68k/kernel/ptrace.c +0 -4
@@ -227,10 +227,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)wake_up_process (child);break ; -case PTRACE_DETACH :/* detach a process that was attached. */ - ret =ptrace_detach (child, data); -break ; -case PTRACE_GETREGS :/* Get all gp regs from the child. */ for (i =0 ; i <19 ; i++) { tmp =get_reg (child, i);
arch/mips/kernel/ptrace.c +0 -4
@@ -435,10 +435,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)wake_up_process (child);break ; -case PTRACE_DETACH :/* detach a process that was attached. */ - ret =ptrace_detach (child, data); -break ; -case PTRACE_GET_THREAD_AREA : ret =put_user (task_thread_info (child)->tp_value, (unsigned long __user *) data);
arch/parisc/kernel/ptrace.c +0 -4
@@ -329,10 +329,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)/* give it a chance to run. */ goto out_wake; -case PTRACE_DETACH : - ret =ptrace_detach (child, data); - goto out_tsk; -case PTRACE_GETEVENTMSG : ret =put_user (child->ptrace_message, (unsigned int __user *) data); goto out_tsk;
arch/powerpc/kernel/ptrace.c +0 -4
@@ -503,10 +503,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) ret =ptrace_set_debugreg (child, addr, data);break ; -case PTRACE_DETACH : - ret =ptrace_detach (child, data); -break ; -#ifdef CONFIG_PPC64 case PTRACE_GETREGS64 :#endif
arch/s390/kernel/ptrace.c +0 -5
@@ -683,11 +683,6 @@ do_ptrace(struct task_struct *child, long request, long addr, long data)wake_up_process (child);return 0 ; -case PTRACE_DETACH : -/* detach a process that was attached. */ -return ptrace_detach (child, data); - -/* Do requests that differ for 31/64 bit */ default :#ifdef CONFIG_COMPAT
arch/sh/kernel/ptrace.c +0 -4
@@ -210,10 +210,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)break ; } -case PTRACE_DETACH :/* detach a process that was attached. */ - ret =ptrace_detach (child, data); -break ; -#ifdef CONFIG_SH_DSP case PTRACE_GETDSPREGS : {unsigned long dp;
arch/sh64/kernel/ptrace.c +0 -4
@@ -244,10 +244,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)break ; } -case PTRACE_DETACH :/* detach a process that was attached. */ - ret =ptrace_detach (child, data); -break ; -default : ret =ptrace_request (child, request, addr, data);break ;
arch/um/kernel/ptrace.c +0 -5
@@ -119,11 +119,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)break ; } -case PTRACE_DETACH : -/* detach a process that was attached. */ - ret =ptrace_detach (child, data); -break ; -#ifdef PTRACE_GETREGS case PTRACE_GETREGS : {/* Get all gp regs from the child. */ if (!access_ok (VERIFY_WRITE , p,MAX_REG_OFFSET )) {
arch/x86_64/kernel/ptrace.c +0 -5
@@ -505,11 +505,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) ret =0 ;break ; -case PTRACE_DETACH : -/* detach a process that was attached. */ - ret =ptrace_detach (child, data); -break ; -case PTRACE_GETREGS : {/* Get all gp regs from the child. */ if (!access_ok (VERIFY_WRITE , (unsigned __user *)data,sizeof (struct user_regs_struct ))) {
arch/xtensa/kernel/ptrace.c +0 -4
@@ -304,10 +304,6 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) ret =put_user (sizeof (elf_fpregset_t), (unsigned long *) data);break ; -case PTRACE_DETACH :/* detach a process that was attached. */ - ret =ptrace_detach (child, data); -break ; -default : ret =ptrace_request (child, request, addr, data); goto out;
kernel/ptrace.c +3 -0
@@ -385,6 +385,9 @@ int ptrace_request(struct task_struct *child, long request,case PTRACE_SETSIGINFO : ret =ptrace_setsiginfo (child, (siginfo_t __user *) data);break ; +case PTRACE_DETACH :/* detach a process that was attached. */ + ret =ptrace_detach (child, data); +break ;default :break ; }
Quoted 3 lines · Alexey Dobriyan
Identical handlers of
PTRACE_DETACHgo intoptrace_request(). Not touching compat code.
Not touching archs that don't callptrace_request.
Looks very nice, thanks.