h8300: use generic ptrace_resume code
Use the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT, PTRACE_KILL and PTRACE_SINGLESTEP. This implies defining arch_has_single_step in <asm/ptrace.h> and implementing the user_enable_single_step and user_disable_single_step functions, which also causes the breakpoint information to be cleared on fork, which could be considered a bug fix. Also the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which it previously wasn't which is consistent with all architectures using the modern ptrace code. Signed-off-by: Christoph Hellwig <hch@lst.de> Cc: Oleg Nesterov <oleg@redhat.com> Cc: Roland McGrath <roland@redhat.com> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
このコミットが含まれているのは:
@@ -60,7 +60,7 @@ int h8300_put_reg(struct task_struct *task, int regno, unsigned long data)
|
||||
}
|
||||
|
||||
/* disable singlestep */
|
||||
void h8300_disable_trace(struct task_struct *child)
|
||||
void user_disable_single_step(struct task_struct *child)
|
||||
{
|
||||
if((long)child->thread.breakinfo.addr != -1L) {
|
||||
*child->thread.breakinfo.addr = child->thread.breakinfo.inst;
|
||||
@@ -264,7 +264,7 @@ static unsigned short *getnextpc(struct task_struct *child, unsigned short *pc)
|
||||
|
||||
/* Set breakpoint(s) to simulate a single step from the current PC. */
|
||||
|
||||
void h8300_enable_trace(struct task_struct *child)
|
||||
void user_enable_single_step(struct task_struct *child)
|
||||
{
|
||||
unsigned short *nextpc;
|
||||
nextpc = getnextpc(child,(unsigned short *)h8300_get_reg(child, PT_PC));
|
||||
@@ -276,7 +276,7 @@ void h8300_enable_trace(struct task_struct *child)
|
||||
asmlinkage void trace_trap(unsigned long bp)
|
||||
{
|
||||
if ((unsigned long)current->thread.breakinfo.addr == bp) {
|
||||
h8300_disable_trace(current);
|
||||
user_disable_single_step(current);
|
||||
force_sig(SIGTRAP,current);
|
||||
} else
|
||||
force_sig(SIGILL,current);
|
||||
|
新しいイシューから参照
ユーザーをブロックする