aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorJon Medhurst <tixy@yxit.co.uk>2011-04-18 03:53:56 -0400
committerNicolas Pitre <nicolas.pitre@linaro.org>2011-04-28 23:40:59 -0400
commitf0aeb8bff0fe9de50e1e4093ef86ff8f17a9b1b0 (patch)
tree5de9db19cd2576c463574ed962c394d13d50a700 /arch/arm
parentac211c6994fb5f1f282745054c00d29e53639cb1 (diff)
ARM: kprobes: Reject probing of SETEND instructions
The emulation of SETEND was broken as it changed the endianess for the running kprobes handling code. Rather than adding a new simulation routine to fix this we'll just reject probing of SETEND as these should be very rare in the kernel. Note, the function emulate_none is now unused but it is left in the source code as future patches will use it. Signed-off-by: Jon Medhurst <tixy@yxit.co.uk> Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/kernel/kprobes-decode.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/arm/kernel/kprobes-decode.c b/arch/arm/kernel/kprobes-decode.c
index fb818976f4cb..b81fbfb33151 100644
--- a/arch/arm/kernel/kprobes-decode.c
+++ b/arch/arm/kernel/kprobes-decode.c
@@ -956,11 +956,6 @@ space_1111(kprobe_opcode_t insn, struct arch_specific_insn *asi)
956 } 956 }
957 957
958 /* SETEND : 1111 0001 0000 0001 xxxx xxxx 0000 xxxx */ 958 /* SETEND : 1111 0001 0000 0001 xxxx xxxx 0000 xxxx */
959 if ((insn & 0xffff00f0) == 0xf1010000) {
960 asi->insn[0] = insn;
961 asi->insn_handler = emulate_none;
962 return INSN_GOOD;
963 }
964 959
965 /* Coprocessor instructions... */ 960 /* Coprocessor instructions... */
966 /* MCRR2 : 1111 1100 0100 xxxx xxxx xxxx xxxx xxxx : (Rd != Rn) */ 961 /* MCRR2 : 1111 1100 0100 xxxx xxxx xxxx xxxx xxxx : (Rd != Rn) */