[PATCH] sparc: Fix PTRACE_CONT bogosity
SunOS aparently had this weird PTRACE_CONT semantic which we copied. If the addr argument is something other than 1, it sets the process program counter to whatever that value is. This is different from every other Linux architecture, which don't do anything with the addr and data args. This difference in particular breaks the Linux native GDB support for fork and vfork tracing on sparc and sparc64. There is no interest in running SunOS binaries using this weird PTRACE_CONT behavior, so just delete it so we behave like other platforms do. Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Родитель
961f8bc9fc
Коммит
fb65b9619b
|
@ -530,18 +530,6 @@ asmlinkage void do_ptrace(struct pt_regs *regs)
|
||||||
pt_error_return(regs, EIO);
|
pt_error_return(regs, EIO);
|
||||||
goto out_tsk;
|
goto out_tsk;
|
||||||
}
|
}
|
||||||
if (addr != 1) {
|
|
||||||
if (addr & 3) {
|
|
||||||
pt_error_return(regs, EINVAL);
|
|
||||||
goto out_tsk;
|
|
||||||
}
|
|
||||||
#ifdef DEBUG_PTRACE
|
|
||||||
printk ("Original: %08lx %08lx\n", child->thread.kregs->pc, child->thread.kregs->npc);
|
|
||||||
printk ("Continuing with %08lx %08lx\n", addr, addr+4);
|
|
||||||
#endif
|
|
||||||
child->thread.kregs->pc = addr;
|
|
||||||
child->thread.kregs->npc = addr + 4;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (request == PTRACE_SYSCALL)
|
if (request == PTRACE_SYSCALL)
|
||||||
set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
|
set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
|
||||||
|
|
|
@ -514,25 +514,6 @@ asmlinkage void do_ptrace(struct pt_regs *regs)
|
||||||
pt_error_return(regs, EIO);
|
pt_error_return(regs, EIO);
|
||||||
goto out_tsk;
|
goto out_tsk;
|
||||||
}
|
}
|
||||||
if (addr != 1) {
|
|
||||||
unsigned long pc_mask = ~0UL;
|
|
||||||
|
|
||||||
if ((child->thread_info->flags & _TIF_32BIT) != 0)
|
|
||||||
pc_mask = 0xffffffff;
|
|
||||||
|
|
||||||
if (addr & 3) {
|
|
||||||
pt_error_return(regs, EINVAL);
|
|
||||||
goto out_tsk;
|
|
||||||
}
|
|
||||||
#ifdef DEBUG_PTRACE
|
|
||||||
printk ("Original: %016lx %016lx\n",
|
|
||||||
child->thread_info->kregs->tpc,
|
|
||||||
child->thread_info->kregs->tnpc);
|
|
||||||
printk ("Continuing with %016lx %016lx\n", addr, addr+4);
|
|
||||||
#endif
|
|
||||||
child->thread_info->kregs->tpc = (addr & pc_mask);
|
|
||||||
child->thread_info->kregs->tnpc = ((addr + 4) & pc_mask);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (request == PTRACE_SYSCALL) {
|
if (request == PTRACE_SYSCALL) {
|
||||||
set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
|
set_tsk_thread_flag(child, TIF_SYSCALL_TRACE);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче