OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5c6b76f
)
ARM: kprobes: Reject probing of LDRB instructions which load PC
author
Jon Medhurst
<tixy@yxit.co.uk>
Tue, 12 Apr 2011 06:45:21 +0000
(07:45 +0100)
committer
Nicolas Pitre
<nicolas.pitre@linaro.org>
Fri, 29 Apr 2011 03:40:57 +0000
(23:40 -0400)
These instructions are specified as UNPREDICTABLE.
Signed-off-by: Jon Medhurst <tixy@yxit.co.uk>
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
arch/arm/kernel/kprobes-decode.c
patch
|
blob
|
history
diff --git
a/arch/arm/kernel/kprobes-decode.c
b/arch/arm/kernel/kprobes-decode.c
index
826abc1
..
a37745f
100644
(file)
--- a/
arch/arm/kernel/kprobes-decode.c
+++ b/
arch/arm/kernel/kprobes-decode.c
@@
-1416,6
+1416,10
@@
space_cccc_01xx(kprobe_opcode_t insn, struct arch_specific_insn *asi)
/* STRB : cccc 01xx x1x0 xxxx xxxx xxxx xxxx xxxx */
/* STRBT : cccc 01x0 x110 xxxx xxxx xxxx xxxx xxxx */
/* STRT : cccc 01x0 x010 xxxx xxxx xxxx xxxx xxxx */
+
+ if ((insn & 0x00500000) == 0x00500000 && is_r15(insn, 12))
+ return INSN_REJECTED; /* LDRB into PC */
+
return prep_emulate_ldr_str(insn, asi);
}