From 51747f5ed8d3f7a390a7485919e1e159bb1019d0 Mon Sep 17 00:00:00 2001 From: Prasanna S Panchamukhi Date: Thu, 5 May 2005 16:15:40 -0700 Subject: [PATCH] --- yaml --- r: 1001 b: refs/heads/master c: 0b9e2cac8a56e197d0a9e06268db4c8652d23dd5 h: refs/heads/master i: 999: 2dc1a7571cbe65074da344e5038d31f31637234c v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/kprobes.c | 7 +++++++ trunk/arch/x86_64/kernel/kprobes.c | 7 +++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index cdd7b5d68117..c648f8b23f49 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3a0a64e6c917b2ccc311cf978cc9d7eef7b31c47 +refs/heads/master: 0b9e2cac8a56e197d0a9e06268db4c8652d23dd5 diff --git a/trunk/arch/i386/kernel/kprobes.c b/trunk/arch/i386/kernel/kprobes.c index 671681659243..59ff9b455069 100644 --- a/trunk/arch/i386/kernel/kprobes.c +++ b/trunk/arch/i386/kernel/kprobes.c @@ -217,6 +217,13 @@ static void resume_execution(struct kprobe *p, struct pt_regs *regs) *tos &= ~(TF_MASK | IF_MASK); *tos |= kprobe_old_eflags; break; + case 0xc3: /* ret/lret */ + case 0xcb: + case 0xc2: + case 0xca: + regs->eflags &= ~TF_MASK; + /* eip is already adjusted, no more changes required*/ + return; case 0xe8: /* call relative - Fix return addr */ *tos = orig_eip + (*tos - copy_eip); break; diff --git a/trunk/arch/x86_64/kernel/kprobes.c b/trunk/arch/x86_64/kernel/kprobes.c index 4f2a852299b6..f77f8a0ff187 100644 --- a/trunk/arch/x86_64/kernel/kprobes.c +++ b/trunk/arch/x86_64/kernel/kprobes.c @@ -355,6 +355,13 @@ static void resume_execution(struct kprobe *p, struct pt_regs *regs) *tos &= ~(TF_MASK | IF_MASK); *tos |= kprobe_old_rflags; break; + case 0xc3: /* ret/lret */ + case 0xcb: + case 0xc2: + case 0xca: + regs->eflags &= ~TF_MASK; + /* rip is already adjusted, no more changes required*/ + return; case 0xe8: /* call relative - Fix return addr */ *tos = orig_rip + (*tos - copy_rip); break;