lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ARM] 5221/1: fix ldm/stm emulation for kprobes

Browse Source 
Logic for the p bit was reversed.

Signed-off-by: Nicolas Pitre <nico@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Nicolas Pitre
2008-08-21 23:22:49 +01:00
committed by Russell King
parent d81030a1ba
commit 2d4b6c9aeb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/kernel/kprobes-decode.c
View File

@@ -488,7 +488,7 @@ static void __kprobes simulate_ldm1stm1(struct kprobe *p, struct pt_regs *regs)
if (!ubit) if (!ubit)
addr -= reg_count; addr -= reg_count;
addr += (!pbit ^ !ubit); addr += (!pbit == !ubit);
reg_bit_vector = insn & 0xffff; reg_bit_vector = insn & 0xffff;
while (reg_bit_vector) { while (reg_bit_vector) {
@@ -503,7 +503,7 @@ static void __kprobes simulate_ldm1stm1(struct kprobe *p, struct pt_regs *regs)
if (wbit) { if (wbit) {
if (!ubit) if (!ubit)
addr -= reg_count; addr -= reg_count;
addr -= (!pbit ^ !ubit); addr -= (!pbit == !ubit);
regs->uregs[rn] = (long)addr; regs->uregs[rn] = (long)addr;
} }
} }