Skip to content

Commit

Permalink
PTRACE_PEEKDATA consolidation
Browse files Browse the repository at this point in the history 
Identical implementations of PTRACE_PEEKDATA go into generic_ptrace_peekdata()
function.

Signed-off-by: Alexey Dobriyan <[email protected]>
Cc: Christoph Hellwig <[email protected]>
Cc: <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Alexey Dobriyan authored and Linus Torvalds committed Jul 17, 2007
1 parent bcdcd8e commit 7664732
Show file tree
Hide file tree
Showing 21 changed files with 43 additions and 166 deletions.
8 changes: 1 addition & 7 deletions arch/arm/kernel/ptrace.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,6 @@ static int ptrace_setcrunchregs(struct task_struct *tsk, void __user *ufp)

long arch_ptrace(struct task_struct *child, long request, long addr, long data)
{
unsigned long tmp;
int ret;

switch (request) {
Expand All @@ -666,12 +665,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
*/
case PTRACE_PEEKTEXT:
case PTRACE_PEEKDATA:
ret = access_process_vm(child, addr, &tmp,
sizeof(unsigned long), 0);
if (ret == sizeof(unsigned long))
ret = put_user(tmp, (unsigned long __user *) data);
else
ret = -EIO;
ret = generic_ptrace_peekdata(child, addr, data);
break;

case PTRACE_PEEKUSR:
Expand Down
8 changes: 1 addition & 7 deletions arch/arm26/kernel/ptrace.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,6 @@ static int ptrace_setfpregs(struct task_struct *tsk, void *ufp)

long arch_ptrace(struct task_struct *child, long request, long addr, long data)
{
unsigned long tmp;
int ret;

switch (request) {
Expand All @@ -540,12 +539,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
*/
case PTRACE_PEEKTEXT:
case PTRACE_PEEKDATA:
ret = access_process_vm(child, addr, &tmp,
sizeof(unsigned long), 0);
if (ret == sizeof(unsigned long))
ret = put_user(tmp, (unsigned long *) data);
else
ret = -EIO;
ret = generic_ptrace_peekdata(child, addr, data);
break;

case PTRACE_PEEKUSR:
Expand Down
7 changes: 1 addition & 6 deletions arch/avr32/kernel/ptrace.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,6 @@ static int ptrace_setregs(struct task_struct *tsk, const void __user *uregs)

long arch_ptrace(struct task_struct *child, long request, long addr, long data)
{
unsigned long tmp;
int ret;

pr_debug("arch_ptrace(%ld, %d, %#lx, %#lx)\n",
Expand All @@ -166,11 +165,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
/* Read the word at location addr in the child process */
case PTRACE_PEEKTEXT:
case PTRACE_PEEKDATA:
ret = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
if (ret == sizeof(tmp))
ret = put_user(tmp, (unsigned long __user *)data);
else
ret = -EIO;
ret = generic_ptrace_peekdata(child, addr, data);
break;

case PTRACE_PEEKUSR:
Expand Down
14 changes: 2 additions & 12 deletions arch/cris/arch-v10/kernel/ptrace.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,19 +83,9 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
switch (request) {
/* Read word at location address. */
case PTRACE_PEEKTEXT:
case PTRACE_PEEKDATA: {
unsigned long tmp;
int copied;

copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
ret = -EIO;

if (copied != sizeof(tmp))
break;

ret = put_user(tmp,datap);
case PTRACE_PEEKDATA:
ret = generic_ptrace_peekdata(child, addr, data);
break;
}

/* Read the word at location address in the USER area. */
case PTRACE_PEEKUSR: {
Expand Down
12 changes: 2 additions & 10 deletions arch/frv/kernel/ptrace.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,20 +112,12 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
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: {
int copied;

case PTRACE_PEEKDATA:
ret = -EIO;
if (is_user_addr_valid(child, addr, sizeof(tmp)) < 0)
break;

copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
if (copied != sizeof(tmp))
break;

ret = put_user(tmp,(unsigned long *) data);
ret = generic_ptrace_peekdata(child, addr, data);
break;
}

/* read the word at location addr in the USER area. */
case PTRACE_PEEKUSR: {
Expand Down
12 changes: 2 additions & 10 deletions arch/i386/kernel/ptrace.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -358,17 +358,9 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
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: {
unsigned long tmp;
int copied;

copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
ret = -EIO;
if (copied != sizeof(tmp))
break;
ret = put_user(tmp, datap);
case PTRACE_PEEKDATA:
ret = generic_ptrace_peekdata(child, addr, data);
break;
}

/* read the word at location addr in the USER area. */
case PTRACE_PEEKUSR: {
Expand Down
7 changes: 1 addition & 6 deletions arch/m32r/kernel/ptrace.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,6 @@ void ptrace_disable(struct task_struct *child)
static int
do_ptrace(long request, struct task_struct *child, long addr, long data)
{
unsigned long tmp;
int ret;

switch (request) {
Expand All @@ -604,11 +603,7 @@ do_ptrace(long request, struct task_struct *child, long addr, long data)
*/
case PTRACE_PEEKTEXT:
case PTRACE_PEEKDATA:
ret = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
if (ret == sizeof(tmp))
ret = put_user(tmp,(unsigned long __user *) data);
else
ret = -EIO;
ret = generic_ptrace_peekdata(child, addr, data);
break;

/*
Expand Down
5 changes: 1 addition & 4 deletions arch/m68k/kernel/ptrace.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
/* when I and D space are separate, these will need to be fixed. */
case PTRACE_PEEKTEXT: /* read word at location addr. */
case PTRACE_PEEKDATA:
i = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
if (i != sizeof(tmp))
goto out_eio;
ret = put_user(tmp, (unsigned long *)data);
ret = generic_ptrace_peekdata(child, addr, data);
break;

/* read the word at location addr in the USER area. */
Expand Down
12 changes: 2 additions & 10 deletions arch/m68knommu/kernel/ptrace.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,17 +106,9 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
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: {
unsigned long tmp;
int copied;

copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
ret = -EIO;
if (copied != sizeof(tmp))
break;
ret = put_user(tmp,(unsigned long *) data);
case PTRACE_PEEKDATA:
ret = generic_ptrace_peekdata(child, addr, data);
break;
}

/* read the word at location addr in the USER area. */
case PTRACE_PEEKUSR: {
Expand Down
12 changes: 2 additions & 10 deletions arch/mips/kernel/ptrace.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,17 +174,9 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
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: {
unsigned long tmp;
int copied;

copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
ret = -EIO;
if (copied != sizeof(tmp))
break;
ret = put_user(tmp,(unsigned long __user *) data);
case PTRACE_PEEKDATA:
ret = generic_ptrace_peekdata(child, addr, data);
break;
}

/* Read the word at location addr in the USER area. */
case PTRACE_PEEKUSR: {
Expand Down
13 changes: 2 additions & 11 deletions arch/parisc/kernel/ptrace.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,9 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
switch (request) {
case PTRACE_PEEKTEXT: /* read word at location addr. */
case PTRACE_PEEKDATA: {
int copied;

#ifdef CONFIG_64BIT
if (__is_compat_task(child)) {
int copied;
unsigned int tmp;

addr &= 0xffffffffL;
Expand All @@ -105,15 +104,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
}
else
#endif
{
unsigned long tmp;

copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
ret = -EIO;
if (copied != sizeof(tmp))
goto out_tsk;
ret = put_user(tmp,(unsigned long *) data);
}
ret = generic_ptrace_peekdata(child, addr, data);
goto out_tsk;
}

Expand Down
12 changes: 2 additions & 10 deletions arch/powerpc/kernel/ptrace.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -379,17 +379,9 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
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: {
unsigned long tmp;
int copied;

copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
ret = -EIO;
if (copied != sizeof(tmp))
break;
ret = put_user(tmp,(unsigned long __user *) data);
case PTRACE_PEEKDATA:
ret = generic_ptrace_peekdata(child, addr, data);
break;
}

/* read the word at location addr in the USER area. */
case PTRACE_PEEKUSR: {
Expand Down
6 changes: 1 addition & 5 deletions arch/s390/kernel/ptrace.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,6 @@ poke_user(struct task_struct *child, addr_t addr, addr_t data)
static int
do_ptrace_normal(struct task_struct *child, long request, long addr, long data)
{
unsigned long tmp;
ptrace_area parea;
int copied, ret;

Expand All @@ -304,10 +303,7 @@ do_ptrace_normal(struct task_struct *child, long request, long addr, long data)
/* Remove high order bit from address (only for 31 bit). */
addr &= PSW_ADDR_INSN;
/* read word at location addr. */
copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
if (copied != sizeof(tmp))
return -EIO;
return put_user(tmp, (unsigned long __force __user *) data);
return generic_ptrace_peekdata(child, addr, data);

case PTRACE_PEEKUSR:
/* read the word at location addr in the USER area. */
Expand Down
13 changes: 2 additions & 11 deletions arch/sh/kernel/ptrace.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,17 +91,8 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
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: {
unsigned long tmp;
int copied;

copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
ret = -EIO;
if (copied != sizeof(tmp))
break;
ret = put_user(tmp,(unsigned long __user *) data);
break;
}
case PTRACE_PEEKDATA:
ret = generic_ptrace_peekdata(child, addr, data);

/* read the word at location addr in the USER area. */
case PTRACE_PEEKUSR: {
Expand Down
12 changes: 2 additions & 10 deletions arch/sh64/kernel/ptrace.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,17 +129,9 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
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: {
unsigned long tmp;
int copied;

copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
ret = -EIO;
if (copied != sizeof(tmp))
break;
ret = put_user(tmp,(unsigned long *) data);
case PTRACE_PEEKDATA:
ret = generic_ptrace_peekdata(child, addr, data);
break;
}

/* read the word at location addr in the USER area. */
case PTRACE_PEEKUSR: {
Expand Down
12 changes: 2 additions & 10 deletions arch/um/kernel/ptrace.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,17 +52,9 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
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: {
unsigned long tmp;
int copied;

ret = -EIO;
copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
if (copied != sizeof(tmp))
break;
ret = put_user(tmp, p);
case PTRACE_PEEKDATA:
ret = generic_ptrace_peekdata(child, addr, data);
break;
}

/* read the word at location addr in the USER area. */
case PTRACE_PEEKUSR:
Expand Down
8 changes: 2 additions & 6 deletions arch/v850/kernel/ptrace.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,15 +117,11 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
int rval;

switch (request) {
unsigned long val, copied;
unsigned long val;

case PTRACE_PEEKTEXT: /* read word at location addr. */
case PTRACE_PEEKDATA:
copied = access_process_vm(child, addr, &val, sizeof(val), 0);
rval = -EIO;
if (copied != sizeof(val))
break;
rval = put_user(val, (unsigned long *)data);
rval = generic_ptrace_peekdata(child, addr, data);
goto out;

case PTRACE_POKETEXT: /* write the word at location addr. */
Expand Down
12 changes: 2 additions & 10 deletions arch/x86_64/kernel/ptrace.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,17 +313,9 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
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: {
unsigned long tmp;
int copied;

copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
ret = -EIO;
if (copied != sizeof(tmp))
break;
ret = put_user(tmp,(unsigned long __user *) data);
case PTRACE_PEEKDATA:
ret = generic_ptrace_peekdata(child, addr, data);
break;
}

/* read the word at location addr in the USER area. */
case PTRACE_PEEKUSR: {
Expand Down
12 changes: 1 addition & 11 deletions arch/xtensa/kernel/ptrace.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,18 +50,8 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
switch (request) {
case PTRACE_PEEKTEXT: /* read word at location addr. */
case PTRACE_PEEKDATA:
{
unsigned long tmp;
int copied;

copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
ret = -EIO;
if (copied != sizeof(tmp))
break;
ret = put_user(tmp,(unsigned long *) data);

ret = generic_ptrace_peekdata(child, addr, data);
goto out;
}

/* Read the word at location addr in the USER area. */

Expand Down
1 change: 1 addition & 0 deletions include/linux/ptrace.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ static inline void ptrace_unlink(struct task_struct *child)
__ptrace_unlink(child);
}

int generic_ptrace_peekdata(struct task_struct *tsk, long addr, long data);

#ifndef force_successful_syscall_return
/*
Expand Down
Loading

0 comments on commit 7664732

Please sign in to comment.