Skip to content

L
linux
Commit 69f447cf authored by Roman Zippel's avatar Roman Zippel Committed by Linus Torvalds
Browse files
Options

[PATCH] m68k: sys_ptrace cleanup 

- create helper function singlestep_disable()
- move variable definitions to the top of the function
- use "out_eio" label as common error destination
- don't clear failure value for PTRACE_SETREGS/PTRACE_GETREGS
Signed-off-by: default avatarRoman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b3319f50
Show whitespace changes
Inline Side-by-side
Showing with 64 additions and 111 deletions
arch/m68k/kernel/ptrace.c
View file @ 69f447cf
...@@ -103,48 +103,56 @@ static inline int put_reg(struct task_struct *task, int regno, ...@@ -103,48 +103,56 @@ static inline int put_reg(struct task_struct *task, int regno,
} }
/* /*
* Called by kernel/ptrace.c when detaching..
*
* Make sure the single step bit is not set. * Make sure the single step bit is not set.
*/ */
void ptrace_disable(struct task_struct *child) static inline void singlestep_disable(struct task_struct *child)
{ {
unsigned long tmp; unsigned long tmp = get_reg(child, PT_SR) & ~(TRACE_BITS << 16);
/* make sure the single step bit is not set. */
tmp = get_reg(child, PT_SR) & ~(TRACE_BITS << 16);
put_reg(child, PT_SR, tmp); put_reg(child, PT_SR, tmp);
child->thread.work.delayed_trace = 0; child->thread.work.delayed_trace = 0;
}
/*
* Called by kernel/ptrace.c when detaching..
*/
void ptrace_disable(struct task_struct *child)
{
singlestep_disable(child);
child->thread.work.syscall_trace = 0; child->thread.work.syscall_trace = 0;
} }
asmlinkage int sys_ptrace(long request, long pid, long addr, long data) asmlinkage int sys_ptrace(long request, long pid, long addr, long data)
{ {
struct task_struct *child; struct task_struct *child;
int ret; unsigned long tmp;
int i, ret = 0;
lock_kernel(); lock_kernel();
ret = -EPERM;
if (request == PTRACE_TRACEME) { if (request == PTRACE_TRACEME) {
/* are we already being traced? */ /* are we already being traced? */
if (current->ptrace & PT_PTRACED) if (current->ptrace & PT_PTRACED) {
ret = -EPERM;
goto out; goto out;
}
/* set the ptrace bit in the process flags. */ /* set the ptrace bit in the process flags. */
current->ptrace |= PT_PTRACED; current->ptrace |= PT_PTRACED;
ret = 0;
goto out; goto out;
} }
ret = -ESRCH;
read_lock(&tasklist_lock); read_lock(&tasklist_lock);
child = find_task_by_pid(pid); child = find_task_by_pid(pid);
if (child) if (child)
get_task_struct(child); get_task_struct(child);
read_unlock(&tasklist_lock); read_unlock(&tasklist_lock);
if (!child) if (unlikely(!child)) {
ret = -ESRCH;
goto out; goto out;
}
/* you may not mess with init */
if (unlikely(pid == 1)) {
ret = -EPERM; ret = -EPERM;
if (pid == 1) /* you may not mess with init */
goto out_tsk; goto out_tsk;
}
if (request == PTRACE_ATTACH) { if (request == PTRACE_ATTACH) {
ret = ptrace_attach(child); ret = ptrace_attach(child);
...@@ -152,86 +160,62 @@ asmlinkage int sys_ptrace(long request, long pid, long addr, long data) ...@@ -152,86 +160,62 @@ asmlinkage int sys_ptrace(long request, long pid, long addr, long data)
} }
ret = ptrace_check_attach(child, request == PTRACE_KILL); ret = ptrace_check_attach(child, request == PTRACE_KILL);
if (ret < 0) if (ret)
goto out_tsk; goto out_tsk;
switch (request) { switch (request) {
/* when I and D space are separate, these will need to be fixed. */ /* when I and D space are separate, these will need to be fixed. */
case PTRACE_PEEKTEXT: /* read word at location addr. */ case PTRACE_PEEKTEXT: /* read word at location addr. */
case PTRACE_PEEKDATA: { case PTRACE_PEEKDATA:
unsigned long tmp; i = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
int copied; if (i != sizeof(tmp))
goto out_eio;
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 = put_user(tmp, (unsigned long *)data);
break; break;
}
/* read the word at location addr in the USER area. */ /* read the word at location addr in the USER area. */
case PTRACE_PEEKUSR: { case PTRACE_PEEKUSR:
unsigned long tmp; if (addr & 3)
goto out_eio;
ret = -EIO; addr >>= 2; /* temporary hack. */
if ((addr & 3) || addr < 0 ||
addr > sizeof(struct user) - 3)
break;
tmp = 0; /* Default return condition */ if (addr >= 0 && addr < 19) {
addr = addr >> 2; /* temporary hack. */
ret = -EIO;
if (addr < 19) {
tmp = get_reg(child, addr); tmp = get_reg(child, addr);
if (addr == PT_SR) if (addr == PT_SR)
tmp >>= 16; tmp >>= 16;
} else if (addr >= 21 && addr < 49) { } else if (addr >= 21 && addr < 49) {
tmp = child->thread.fp[addr - 21]; tmp = child->thread.fp[addr - 21];
#ifdef CONFIG_M68KFPU_EMU
/* Convert internal fpu reg representation /* Convert internal fpu reg representation
* into long double format * into long double format
*/ */
if (FPU_IS_EMU && (addr < 45) && !(addr % 3)) if (FPU_IS_EMU && (addr < 45) && !(addr % 3))
tmp = ((tmp & 0xffff0000) << 15) | tmp = ((tmp & 0xffff0000) << 15) |
((tmp & 0x0000ffff) << 16); ((tmp & 0x0000ffff) << 16);
#endif
} else } else
break; break;
ret = put_user(tmp, (unsigned long *)data); ret = put_user(tmp, (unsigned long *)data);
break; break;
}
/* when I and D space are separate, this will have to be fixed. */ /* when I and D space are separate, this will have to be fixed. */
case PTRACE_POKETEXT: /* write the word at location addr. */ case PTRACE_POKETEXT: /* write the word at location addr. */
case PTRACE_POKEDATA: case PTRACE_POKEDATA:
ret = 0; if (access_process_vm(child, addr, &data, sizeof(data), 1) != sizeof(data))
if (access_process_vm(child, addr, &data, sizeof(data), 1) == sizeof(data)) goto out_eio;
break;
ret = -EIO;
break; break;
case PTRACE_POKEUSR: /* write the word at location addr in the USER area */ case PTRACE_POKEUSR: /* write the word at location addr in the USER area */
ret = -EIO; if (addr & 3)
if ((addr & 3) || addr < 0 || goto out_eio;
addr > sizeof(struct user) - 3) addr >>= 2; /* temporary hack. */
break;
addr = addr >> 2; /* temporary hack. */
if (addr == PT_SR) { if (addr == PT_SR) {
data &= SR_MASK; data &= SR_MASK;
data <<= 16; data <<= 16;
data |= get_reg(child, PT_SR) & ~(SR_MASK << 16); data |= get_reg(child, PT_SR) & ~(SR_MASK << 16);
} } else if (addr >= 0 && addr < 19) {
if (addr < 19) {
if (put_reg(child, addr, data)) if (put_reg(child, addr, data))
break; goto out_eio;
ret = 0; } else if (addr >= 21 && addr < 48) {
break;
}
if (addr >= 21 && addr < 48) {
#ifdef CONFIG_M68KFPU_EMU
/* Convert long double format /* Convert long double format
* into internal fpu reg representation * into internal fpu reg representation
*/ */
...@@ -240,60 +224,42 @@ asmlinkage int sys_ptrace(long request, long pid, long addr, long data) ...@@ -240,60 +224,42 @@ asmlinkage int sys_ptrace(long request, long pid, long addr, long data)
data = (data & 0xffff0000) | data = (data & 0xffff0000) |
((data & 0x0000ffff) >> 1); ((data & 0x0000ffff) >> 1);
} }
#endif
child->thread.fp[addr - 21] = data; child->thread.fp[addr - 21] = data;
ret = 0; } else
} goto out_eio;
break; break;
case PTRACE_SYSCALL: /* continue and stop at next (return from) syscall */ case PTRACE_SYSCALL: /* continue and stop at next (return from) syscall */
case PTRACE_CONT: { /* restart after signal. */ case PTRACE_CONT: /* restart after signal. */
long tmp;
ret = -EIO;
if (!valid_signal(data)) if (!valid_signal(data))
break; goto out_eio;
if (request == PTRACE_SYSCALL) {
if (request == PTRACE_SYSCALL)
child->thread.work.syscall_trace = ~0; child->thread.work.syscall_trace = ~0;
} else { else
child->thread.work.syscall_trace = 0; child->thread.work.syscall_trace = 0;
}
child->exit_code = data; child->exit_code = data;
/* make sure the single step bit is not set. */ singlestep_disable(child);
tmp = get_reg(child, PT_SR) & ~(TRACE_BITS << 16);
put_reg(child, PT_SR, tmp);
child->thread.work.delayed_trace = 0;
wake_up_process(child); wake_up_process(child);
ret = 0;
break; break;
}
/* /*
* make the child exit. Best I can do is send it a sigkill. * make the child exit. Best I can do is send it a sigkill.
* perhaps it should be put in the status that it wants to * perhaps it should be put in the status that it wants to
* exit. * exit.
*/ */
case PTRACE_KILL: { case PTRACE_KILL:
long tmp;
ret = 0;
if (child->exit_state == EXIT_ZOMBIE) /* already dead */ if (child->exit_state == EXIT_ZOMBIE) /* already dead */
break; break;
child->exit_code = SIGKILL; child->exit_code = SIGKILL;
/* make sure the single step bit is not set. */ singlestep_disable(child);
tmp = get_reg(child, PT_SR) & ~(TRACE_BITS << 16);
put_reg(child, PT_SR, tmp);
child->thread.work.delayed_trace = 0;
wake_up_process(child); wake_up_process(child);
break; break;
}
case PTRACE_SINGLESTEP: { /* set the trap flag. */ case PTRACE_SINGLESTEP: /* set the trap flag. */
long tmp;
ret = -EIO;
if (!valid_signal(data)) if (!valid_signal(data))
break; goto out_eio;
child->thread.work.syscall_trace = 0; child->thread.work.syscall_trace = 0;
tmp = get_reg(child, PT_SR) | (TRACE_BITS << 16); tmp = get_reg(child, PT_SR) | (TRACE_BITS << 16);
put_reg(child, PT_SR, tmp); put_reg(child, PT_SR, tmp);
...@@ -302,39 +268,29 @@ asmlinkage int sys_ptrace(long request, long pid, long addr, long data) ...@@ -302,39 +268,29 @@ asmlinkage int sys_ptrace(long request, long pid, long addr, long data)
child->exit_code = data; child->exit_code = data;
/* give it a chance to run. */ /* give it a chance to run. */
wake_up_process(child); wake_up_process(child);
ret = 0;
break; break;
}
case PTRACE_DETACH: /* detach a process that was attached. */ case PTRACE_DETACH: /* detach a process that was attached. */
ret = ptrace_detach(child, data); ret = ptrace_detach(child, data);
break; break;
case PTRACE_GETREGS: { /* Get all gp regs from the child. */ case PTRACE_GETREGS: /* Get all gp regs from the child. */
int i;
unsigned long tmp;
for (i = 0; i < 19; i++) { for (i = 0; i < 19; i++) {
tmp = get_reg(child, i); tmp = get_reg(child, i);
if (i == PT_SR) if (i == PT_SR)
tmp >>= 16; tmp >>= 16;
if (put_user(tmp, (unsigned long *)data)) { ret = put_user(tmp, (unsigned long *)data);
ret = -EFAULT; if (ret)
break; break;
}
data += sizeof(long); data += sizeof(long);
} }
ret = 0;
break; break;
}
case PTRACE_SETREGS: { /* Set all gp regs in the child. */ case PTRACE_SETREGS: /* Set all gp regs in the child. */
int i;
unsigned long tmp;
for (i = 0; i < 19; i++) { for (i = 0; i < 19; i++) {
if (get_user(tmp, (unsigned long *)data)) { ret = get_user(tmp, (unsigned long *)data);
ret = -EFAULT; if (ret)
break; break;
}
if (i == PT_SR) { if (i == PT_SR) {
tmp &= SR_MASK; tmp &= SR_MASK;
tmp <<= 16; tmp <<= 16;
...@@ -343,25 +299,19 @@ asmlinkage int sys_ptrace(long request, long pid, long addr, long data) ...@@ -343,25 +299,19 @@ asmlinkage int sys_ptrace(long request, long pid, long addr, long data)
put_reg(child, i, tmp); put_reg(child, i, tmp);
data += sizeof(long); data += sizeof(long);
} }
ret = 0;
break; break;
}
case PTRACE_GETFPREGS: { /* Get the child FPU state. */ case PTRACE_GETFPREGS: /* Get the child FPU state. */
ret = 0;
if (copy_to_user((void *)data, &child->thread.fp, if (copy_to_user((void *)data, &child->thread.fp,
sizeof(struct user_m68kfp_struct))) sizeof(struct user_m68kfp_struct)))
ret = -EFAULT; ret = -EFAULT;
break; break;
}
case PTRACE_SETFPREGS: { /* Set the child FPU state. */ case PTRACE_SETFPREGS: /* Set the child FPU state. */
ret = 0;
if (copy_from_user(&child->thread.fp, (void *)data, if (copy_from_user(&child->thread.fp, (void *)data,
sizeof(struct user_m68kfp_struct))) sizeof(struct user_m68kfp_struct)))
ret = -EFAULT; ret = -EFAULT;
break; break;
}
default: default:
ret = ptrace_request(child, request, addr, data); ret = ptrace_request(child, request, addr, data);
...@@ -372,6 +322,9 @@ asmlinkage int sys_ptrace(long request, long pid, long addr, long data) ...@@ -372,6 +322,9 @@ asmlinkage int sys_ptrace(long request, long pid, long addr, long data)
out: out:
unlock_kernel(); unlock_kernel();
return ret; return ret;
out_eio:
ret = -EIO;
goto out_tsk;
} }
asmlinkage void syscall_trace(void) asmlinkage void syscall_trace(void)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7