Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 81ff5720 authored by Jon Medhurst's avatar Jon Medhurst Committed by Nicolas Pitre
Browse files

ARM: kprobes: Reject probing of LDRB instructions which load PC 



These instructions are specified as UNPREDICTABLE.

Signed-off-by: default avatarJon Medhurst <tixy@yxit.co.uk>
Signed-off-by: default avatarNicolas Pitre <nicolas.pitre@linaro.org>
parent 5c6b76fc

arch/arm/kernel/kprobes-decode.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -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 */

	/* STRB  : cccc 01xx x1x0 xxxx xxxx xxxx xxxx xxxx */

	/* STRBT : cccc 01x0 x110 xxxx xxxx xxxx xxxx xxxx */

	/* STRBT : cccc 01x0 x110 xxxx xxxx xxxx xxxx xxxx */

	/* STRT  : cccc 01x0 x010 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);

	return prep_emulate_ldr_str(insn, asi);

}

}