Skip to contentSkip to conversation

Don't emulate mr. instructions

PATCH New Ananth N Mavinakayanahalli 1 participant 1 message Feb 6, 2009 PowerPC

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Don't emulate mr. instructions

Currently emulate_step() emulates mr. instructions without updating cr0 and this can be disastrous. Don't emulate mr.

This bug has been around for a while, but I am not sure if its a worthy -stable candidate. I'll leave it to Ben do decide.

---
 arch/powerpc/lib/sstep.c |    2 ++
 1 file changed, 2 insertions(+)
arch/powerpc/lib/sstep.c +2 -0
Index: linux-2.6.29-rc3/arch/powerpc/lib/sstep.c
===================================================================
@@ -172,6 +172,8 @@ int __kprobes emulate_step(struct pt_reg
 			}
 			break;
 		case 0x378:	/* orx */
+			if (instr & 1)
+				break;
 			rs = (instr >> 21) & 0x1f;
 			rb = (instr >> 11) & 0x1f;
 			if (rs == rb) {		/* mr */