FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-27 03:47:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ARM: kprobes: Fix emulation of LDRH, STRH, LDRSB and LDRSH instructions

Browse Source 
The decoding of these instructions got the register indexed and
immediate indexed forms the wrong way around, causing incorrect
emulation.

Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
This commit is contained in:
Jon Medhurst 2011-04-08 15:32:54 +01:00 committed by Nicolas Pitre
parent ec58d7f237
commit 6823fc85fc
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -883,11 +883,12 @@ emulate_alu_tests(struct kprobe *p, struct pt_regs *regs)
static enum kprobe_insn __kprobes static enum kprobe_insn __kprobes
prep_emulate_ldr_str(kprobe_opcode_t insn, struct arch_specific_insn *asi) prep_emulate_ldr_str(kprobe_opcode_t insn, struct arch_specific_insn *asi)
{ {
int ibit = (insn & (1 << 26)) ? 25 : 22; int not_imm = (insn & (1 << 26)) ? (insn & (1 << 25))
: (~insn & (1 << 22));
insn &= 0xfff00fff; insn &= 0xfff00fff;
insn |= 0x00001000; /* Rn = r0, Rd = r1 */ insn |= 0x00001000; /* Rn = r0, Rd = r1 */
if (insn & (1 << ibit)) { if (not_imm) {
insn &= ~0xf; insn &= ~0xf;
insn |= 2; /* Rm = r2 */ insn |= 2; /* Rm = r2 */
} }