tree 1b991ceb7bd59916ef72cb029ef0082b93b9b8dd
parent 762a6ea2fc9d9e0686d95294ef12faa91943b731
author Andi Kleen <[EMAIL PROTECTED]> Tue Apr 12 08:25:28 2005
committer Linus Torvalds <[EMAIL PROTECTED]> Tue Apr 12 08:25:28 2005
[PATCH] x86_64: Some fixes for single step handling
Ported from i386/Linus
Be more careful with TF handling to fix some copy protection codes in Wine
Signed-off-by: Andi Kleen <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
signal.c | 18 ++++--------------
traps.c | 10 ++++++++--
2 files changed, 12 insertions(+), 16 deletions(-)
Index: arch/x86_64/kernel/signal.c
===================================================================
--- 96792765512ee27d599c6b1efe1d487507e7b549/arch/x86_64/kernel/signal.c
(mode:100644 sha1:df6f2f61543084236b87b6e36139d5d4d1c51748)
+++ 1b991ceb7bd59916ef72cb029ef0082b93b9b8dd/arch/x86_64/kernel/signal.c
(mode:100644 sha1:fd201ec29bf1d61b9e54e18e67b31269021efc0e)
@@ -185,7 +185,6 @@
setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs, unsigned
long mask, struct task_struct *me)
{
int err = 0;
- unsigned long eflags;
err |= __put_user(0, &sc->gs);
err |= __put_user(0, &sc->fs);
@@ -209,11 +208,7 @@
err |= __put_user(me->thread.trap_no, &sc->trapno);
err |= __put_user(me->thread.error_code, &sc->err);
err |= __put_user(regs->rip, &sc->rip);
- eflags = regs->eflags;
- if (current->ptrace & PT_PTRACED) {
- eflags &= ~TF_MASK;
- }
- err |= __put_user(eflags, &sc->eflags);
+ err |= __put_user(regs->eflags, &sc->eflags);
err |= __put_user(mask, &sc->oldmask);
err |= __put_user(me->thread.cr2, &sc->cr2);
@@ -323,14 +318,9 @@
regs->rsp = (unsigned long)frame;
set_fs(USER_DS);
- if (regs->eflags & TF_MASK) {
- if ((current->ptrace & (PT_PTRACED | PT_DTRACE)) == (PT_PTRACED
| PT_DTRACE)) {
- ptrace_notify(SIGTRAP);
- } else {
- regs->eflags &= ~TF_MASK;
- }
- }
-
+ regs->eflags &= ~TF_MASK;
+ if (test_thread_flag(TIF_SINGLESTEP))
+ ptrace_notify(SIGTRAP);
#ifdef DEBUG_SIG
printk("SIG deliver (%s:%d): sp=%p pc=%p ra=%p\n",
current->comm, current->pid, frame, regs->rip, frame->pretcode);
Index: arch/x86_64/kernel/traps.c
===================================================================
--- 96792765512ee27d599c6b1efe1d487507e7b549/arch/x86_64/kernel/traps.c
(mode:100644 sha1:f884e6499b29f80b76df157d58b68bdbfe0ba36f)
+++ 1b991ceb7bd59916ef72cb029ef0082b93b9b8dd/arch/x86_64/kernel/traps.c
(mode:100644 sha1:5c843c58cf64550a907d9c14d89cbc7a120d1475)
@@ -688,8 +688,14 @@
*/
if ((regs->cs & 3) == 0)
goto clear_TF_reenable;
- if ((tsk->ptrace & (PT_DTRACE|PT_PTRACED)) == PT_DTRACE)
- goto clear_TF;
+ /*
+ * Was the TF flag set by a debugger? If so, clear it now,
+ * so that register information is correct.
+ */
+ if (tsk->ptrace & PT_DTRACE) {
+ regs->eflags &= ~TF_MASK;
+ tsk->ptrace &= ~PT_DTRACE;
+ }
}
/* Ok, finally something we can handle */
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
