use ptrace_request to handle {PEEK,POKE}{TEXT,DATA}
Subsystems (7)
PATCH 2/2 use ptrace_request to handle {PEEK,POKE}{TEXT,DATA}
No need to call generic_ptrace_peekdata/generic_ptrace_pokedata or even opencoding it when we can leave that to ptrace_request. Excepted are those architecures not calling ptrace_request at all (m68knommu, h8300 and microblaze), and those having weird ABIs (alpha for the peek variants) or needing additional cache flushing.
Signed-off-by Christoph Hellwig <[email protected]>
arch/arm/kernel/ptrace.c +0 -13
@@ -715,23 +715,10 @@ long arch_ptrace(struct task_struct *chi/* * read word at location "addr" in the child process. */ -case PTRACE_PEEKTEXT : -case PTRACE_PEEKDATA : - ret =generic_ptrace_peekdata (child, addr, data); -break ; -case PTRACE_PEEKUSR : ret =ptrace_read_user (child, addr, (unsigned long __user *)data);break ; -/* -* write the word at location addr. -*/ -case PTRACE_POKETEXT : -case PTRACE_POKEDATA : - ret =generic_ptrace_pokedata (child, addr, data); -break ; -case PTRACE_POKEUSR : ret =ptrace_write_user (child, addr, data);break ;
arch/avr32/kernel/ptrace.c +0 -11
@@ -147,22 +147,11 @@ long arch_ptrace(struct task_struct *chiswitch (request) {/* Read the word at location addr in the child process */ -case PTRACE_PEEKTEXT : -case PTRACE_PEEKDATA : - ret =generic_ptrace_peekdata (child, addr, data); -break ; -case PTRACE_PEEKUSR : ret =ptrace_read_user (child, addr, (unsigned long __user *)data);break ; -/* Write the word in data at location addr */ -case PTRACE_POKETEXT : -case PTRACE_POKEDATA : - ret =generic_ptrace_pokedata (child, addr, data); -break ; -case PTRACE_POKEUSR : ret =ptrace_write_user (child, addr, data);break ;
arch/cris/arch-v10/kernel/ptrace.c +0 -12
@@ -82,12 +82,6 @@ long arch_ptrace(struct task_struct *chiunsigned long __user *datap = (unsigned long __user *)data;switch (request) { -/* Read word at location address. */ -case PTRACE_PEEKTEXT : -case PTRACE_PEEKDATA : - ret =generic_ptrace_peekdata (child, addr, data); -break ; -/* Read the word at location address in the USER area. */ case PTRACE_PEEKUSR : {unsigned long tmp;
@@ -101,12 +95,6 @@ long arch_ptrace(struct task_struct *chibreak ; } -/* Write the word at location address. */ -case PTRACE_POKETEXT : -case PTRACE_POKEDATA : - ret =generic_ptrace_pokedata (child, addr, data); -break ; -/* Write the word at location address in the USER area. */ case PTRACE_POKEUSR : ret = -EIO ;
arch/cris/arch-v32/kernel/ptrace.c +0 -6
@@ -143,12 +143,6 @@ long arch_ptrace(struct task_struct *chibreak ; } -/* Write the word at location address. */ -case PTRACE_POKETEXT : -case PTRACE_POKEDATA : - ret =generic_ptrace_pokedata (child, addr, data); -break ; -/* Write the word at location address in the USER area. */ case PTRACE_POKEUSR : ret = -EIO ;
arch/m32r/kernel/ptrace.c +1 -10
@@ -598,14 +598,6 @@ arch_ptrace(struct task_struct *child, lswitch (request) {/* -* read word at location "addr" in the child process. -*/ -case PTRACE_PEEKTEXT : -case PTRACE_PEEKDATA : - ret =generic_ptrace_peekdata (child, addr, data); -break ; - -/* * read the word at location addr in the USER area. */ case PTRACE_PEEKUSR :
@@ -617,9 +609,8 @@ arch_ptrace(struct task_struct *child, l* write the word at location addr. */ case PTRACE_POKETEXT : -case PTRACE_POKEDATA : ret =generic_ptrace_pokedata (child, addr, data); -if (ret ==0 && request ==PTRACE_POKETEXT ) +if (ret ==0 )invalidate_cache ();break ;
arch/microblaze/kernel/ptrace.c +0 -20
@@ -78,26 +78,6 @@ long arch_ptrace(struct task_struct *chiunsigned long copied;switch (request) { -case PTRACE_PEEKTEXT :/* read word at location addr. */ -case PTRACE_PEEKDATA : -pr_debug ("PEEKTEXT/PEEKDATA at %08lX\n" , addr); - copied =access_process_vm (child, addr, &val,sizeof (val),0 ); - rval = -EIO ; -if (copied !=sizeof (val)) -break ; - rval =put_user (val, (unsigned long *)data); -break ; - -case PTRACE_POKETEXT :/* write the word at location addr. */ -case PTRACE_POKEDATA : -pr_debug ("POKETEXT/POKEDATA to %08lX\n" , addr); - rval =0 ; -if (access_process_vm (child, addr, &data,sizeof (data),1 ) - ==sizeof (data)) -break ; - rval = -EIO ; -break ; -/* Read/write the word at location ADDR in the registers. */ case PTRACE_PEEKUSR :case PTRACE_POKEUSR :
arch/mips/kernel/ptrace.c +0 -12
@@ -260,12 +260,6 @@ long arch_ptrace(struct task_struct *chiint ret;switch (request) { -/* when I and D space are separate, these will need to be fixed. */ -case PTRACE_PEEKTEXT :/* read word at location addr. */ -case PTRACE_PEEKDATA : - ret =generic_ptrace_peekdata (child, addr, data); -break ; -/* Read the word at location addr in the USER area. */ case PTRACE_PEEKUSR : {struct pt_regs *regs;
@@ -390,12 +384,6 @@ long arch_ptrace(struct task_struct *chibreak ; } -/* when I and D space are separate, this will have to be fixed. */ -case PTRACE_POKETEXT :/* write the word at location addr. */ -case PTRACE_POKEDATA : - ret =generic_ptrace_pokedata (child, addr, data); -break ; -case PTRACE_POKEUSR : {struct pt_regs *regs; ret =0 ;
arch/um/kernel/ptrace.c +0 -12
@@ -42,23 +42,11 @@ long arch_ptrace(struct task_struct *chiunsigned long __user *p = (void __user *)(unsigned long )data;switch (request) { -/* read word at location addr. */ -case PTRACE_PEEKTEXT : -case PTRACE_PEEKDATA : - ret =generic_ptrace_peekdata (child, addr, data); -break ; -/* read the word at location addr in the USER area. */ case PTRACE_PEEKUSR : ret =peek_user (child, addr, data);break ; -/* write the word at location addr. */ -case PTRACE_POKETEXT : -case PTRACE_POKEDATA : - ret =generic_ptrace_pokedata (child, addr, data); -break ; -/* write the word at location addr in the USER area */ case PTRACE_POKEUSR : ret =poke_user (child, addr, data);
arch/xtensa/kernel/ptrace.c +0 -10
@@ -250,20 +250,10 @@ long arch_ptrace(struct task_struct *chiint ret = -EPERM ;switch (request) { -case PTRACE_PEEKTEXT :/* read word at location addr. */ -case PTRACE_PEEKDATA : - ret =generic_ptrace_peekdata (child, addr, data); -break ; -case PTRACE_PEEKUSR :/* read register specified by addr. */ ret =ptrace_peekusr (child, addr, (void __user *) data);break ; -case PTRACE_POKETEXT :/* write the word at location addr. */ -case PTRACE_POKEDATA : - ret =generic_ptrace_pokedata (child, addr, data); -break ; -case PTRACE_POKEUSR :/* write register specified by addr. */ ret =ptrace_pokeusr (child, addr, data);break ;
arch/alpha/kernel/ptrace.c +0 -6
@@ -285,12 +285,6 @@ long arch_ptrace(struct task_struct *chiDBG (DBG_MEM , ("peek $%ld->%#lx\n" , addr, ret));break ; -/* When I and D space are separate, this will have to be fixed. */ -case PTRACE_POKETEXT :/* write the word at location addr. */ -case PTRACE_POKEDATA : - ret =generic_ptrace_pokedata (child, addr, data); -break ; -case PTRACE_POKEUSR :/* write the specified register */ DBG (DBG_MEM , ("poke $%ld<-%#lx\n" , addr, data)); ret =put_reg (child, addr, data);
Acked-by Roland McGrath <[email protected]>