Thanks
Prasanna
Kprobes could not handle the insertion of a probe on a ret/lret instruction.
This patch fixes the above bug by avoiding adjustment of instruction pointer,
Signed-off-by: Prasanna S Panchamukhi <prasanna@in.ibm.com>
---
linux-2.6.11-rc5-prasanna/arch/i386/kernel/kprobes.c | 8 ++++++++
1 files changed, 8 insertions(+)
diff -puN arch/i386/kernel/kprobes.c~kprobes-ret-address-fix arch/i386/kernel/kprobes.c
--- linux-2.6.11-rc5/arch/i386/kernel/kprobes.c~kprobes-ret-address-fix 2005-03-14 21:27:34.000000000 +0530
+++ linux-2.6.11-rc5-prasanna/arch/i386/kernel/kprobes.c 2005-03-14 21:48:39.000000000 +0530
@@ -208,6 +208,14 @@ static void resume_execution(struct kpro
*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;
+ break;
case 0xe8: /* call relative - Fix return addr */
*tos = orig_eip + (*tos - copy_eip);
break;
_