From: "Andi Kleen" <[EMAIL PROTECTED]>
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]>
---
25-akpm/arch/x86_64/kernel/signal.c | 18 ++++--------------
25-akpm/arch/x86_64/kernel/traps.c | 10 ++++++++--
2 files changed, 12 insertions(+), 16 deletions(-)
diff -puN
arch/x86_64/kernel/signal.c~x86_64-some-fixes-for-single-step-handling
arch/x86_64/kernel/signal.c
--- 25/arch/x86_64/kernel/signal.c~x86_64-some-fixes-for-single-step-handling
2005-04-12 03:21:21.347891528 -0700
+++ 25-akpm/arch/x86_64/kernel/signal.c 2005-04-12 03:21:21.352890768 -0700
@@ -185,7 +185,6 @@ static inline int
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 @@ setup_sigcontext(struct sigcontext __use
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 @@ static void setup_rt_frame(int sig, stru
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);
diff -puN arch/x86_64/kernel/traps.c~x86_64-some-fixes-for-single-step-handling
arch/x86_64/kernel/traps.c
--- 25/arch/x86_64/kernel/traps.c~x86_64-some-fixes-for-single-step-handling
2005-04-12 03:21:21.349891224 -0700
+++ 25-akpm/arch/x86_64/kernel/traps.c 2005-04-12 03:21:21.353890616 -0700
@@ -688,8 +688,14 @@ asmlinkage void *do_debug(struct pt_regs
*/
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 linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
