The patch titled
kprobe: fix resume execution on i386
has been removed from the -mm tree. Its filename is
kprobe-fix-resume-execution-on-i386.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
From: Masami Hiramatsu <hiramatu@xxxxxxxxxxxxxxxxx>
Fix resume_execution() to handle iret and absolute jump opcode correctly on
i386.
Signed-off-by: Masami Hiramatsu <hiramatu@xxxxxxxxxxxxxxxxx>
Cc: Ananth N Mavinakayanahalli <ananth@xxxxxxxxxx>
Cc: "Keshavamurthy, Anil S" <anil.s.keshavamurthy@xxxxxxxxx>
Cc: Prasanna S Panchamukhi <prasanna@xxxxxxxxxx>
Cc: Jim Keniston <jkenisto@xxxxxxxxxx>
Cc: Yumiko Sugita <sugita@xxxxxxxxxxxxxxxxx>
Cc: Satoshi Oshima <soshima@xxxxxxxxxx>
Cc: Hideo Aoki <haoki@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/i386/kernel/kprobes.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff -puN arch/i386/kernel/kprobes.c~kprobe-fix-resume-execution-on-i386 arch/i386/kernel/kprobes.c
--- devel/arch/i386/kernel/kprobes.c~kprobe-fix-resume-execution-on-i386 2006-04-27 18:39:04.000000000 -0700
+++ devel-akpm/arch/i386/kernel/kprobes.c 2006-04-27 18:39:04.000000000 -0700
@@ -443,10 +443,11 @@ static void __kprobes resume_execution(s
*tos &= ~(TF_MASK | IF_MASK);
*tos |= kcb->kprobe_old_eflags;
break;
- case 0xc3: /* ret/lret */
- case 0xcb:
- case 0xc2:
+ case 0xc2: /* iret/ret/lret */
+ case 0xc3:
case 0xca:
+ case 0xcb:
+ case 0xcf:
case 0xea: /* jmp absolute -- eip is correct */
/* eip is already adjusted, no more changes required */
p->ainsn.boostable = 1;
@@ -454,10 +455,13 @@ static void __kprobes resume_execution(s
case 0xe8: /* call relative - Fix return addr */
*tos = orig_eip + (*tos - copy_eip);
break;
+ case 0x9a: /* call absolute -- same as call absolute, indirect */
+ *tos = orig_eip + (*tos - copy_eip);
+ goto no_change;
case 0xff:
if ((p->ainsn.insn[1] & 0x30) == 0x10) {
- /* call absolute, indirect */
/*
+ * call absolute, indirect
* Fix return addr; eip is correct.
* But this is not boostable
*/
_
Patches currently in -mm which might be from hiramatu@xxxxxxxxxxxxxxxxx are
origin.patch
kprobe-boost-2byte-opcodes-on-i386.patch
kprobemulti-kprobe-posthandler-for-booster.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
