diff options
| author | Ananth N Mavinakayanahalli <ananth@in.ibm.com> | 2009-02-06 02:02:00 +0000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-02-10 14:39:07 +1100 |
| commit | eef336189b2b5ae68bfbef0df24176a4a152d981 (patch) | |
| tree | 53bc8eba3f2a23911430f9319ddc8609c6c8472d /arch | |
| parent | 6c24b17453c8dc444a746e45b8a404498fc9fcf7 (diff) | |
| download | op-kernel-dev-eef336189b2b5ae68bfbef0df24176a4a152d981.zip op-kernel-dev-eef336189b2b5ae68bfbef0df24176a4a152d981.tar.gz | |
powerpc: 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.
Signed-off-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/lib/sstep.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/lib/sstep.c b/arch/powerpc/lib/sstep.c index 4aae0c3..13b7d54 100644 --- a/arch/powerpc/lib/sstep.c +++ b/arch/powerpc/lib/sstep.c @@ -172,6 +172,8 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr) } break; case 0x378: /* orx */ + if (instr & 1) + break; rs = (instr >> 21) & 0x1f; rb = (instr >> 11) & 0x1f; if (rs == rb) { /* mr */ |
