tree 6c11d1fe32e7811c923ca5c7c21b89a78b5dd52f
parent aa85b9af5bdae1f8b84d80367324e4410c3f0674
author Andi Kleen <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:24:57 -0700
committer Linus Torvalds <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:24:57 -0700
[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]>
x86_64/kernel/signal.c | 18 ++++--------------
x86_64/kernel/traps.c | 10 ++++++++--
2 files changed, 12 insertions(+), 16 deletions(-)
Index: arch/x86_64/kernel/signal.c
===================================================================
--- a312656fa0b997000a859e88f357f23d2e25cdef/arch/x86_64/kernel/signal.c
(mode:100644 sha1:5ace32c6ac5c54c3add8122b940689db3a0e53af)
+++ 6c11d1fe32e7811c923ca5c7c21b89a78b5dd52f/arch/x86_64/kernel/signal.c
(mode:100644 sha1:4ff0f0117a091c991d63860cc2aae31184311e47)
@@ -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
===================================================================
--- a312656fa0b997000a859e88f357f23d2e25cdef/arch/x86_64/kernel/traps.c
(mode:100644 sha1:2707a27b81cd5efa4bf1b2ea5de729b440c05b2b)
+++ 6c11d1fe32e7811c923ca5c7c21b89a78b5dd52f/arch/x86_64/kernel/traps.c
(mode:100644 sha1:09e4a6460e74d09b9bc7e5562a0aba1eae57b55b)
@@ -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
