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

Commit 56d8fbdd authored by Jon Medhurst's avatar Jon Medhurst Committed by Tixy
Browse files

ARM: kprobes: Migrate ARM space_cccc_01xx to decoding tables 



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

arch/arm/kernel/kprobes-arm.c

+19 −18
Original line number Diff line number Diff line
@@ -1415,23 +1415,24 @@ static const union decode_item arm_cccc_0111_____xxx1_table[] = { 
	DECODE_END

};



static enum kprobe_insn __kprobes

space_cccc_01xx(kprobe_opcode_t insn, struct arch_specific_insn *asi)

{

	/* LDR   : cccc 01xx x0x1 xxxx xxxx xxxx xxxx xxxx */

	/* LDRB  : cccc 01xx x1x1 xxxx xxxx xxxx xxxx xxxx */

	/* LDRBT : cccc 01x0 x111 xxxx xxxx xxxx xxxx xxxx */

	/* LDRT  : cccc 01x0 x011 xxxx xxxx xxxx xxxx xxxx */

	/* STR   : cccc 01xx x0x0 xxxx xxxx xxxx xxxx xxxx */

	/* 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);

}

static const union decode_item arm_cccc_01xx_table[] = {

	/* Load/store word and unsigned byte				*/



	/* LDRB/STRB pc,[...]	cccc 01xx x0xx xxxx xxxx xxxx xxxx xxxx */

	DECODE_REJECT	(0x0c40f000, 0x0440f000),



	/* LDR			cccc 01xx x0x1 xxxx xxxx xxxx xxxx xxxx */

	/* LDRB			cccc 01xx x1x1 xxxx xxxx xxxx xxxx xxxx */

	/* LDRBT		cccc 01x0 x111 xxxx xxxx xxxx xxxx xxxx */

	/* LDRT			cccc 01x0 x011 xxxx xxxx xxxx xxxx xxxx */

	/* STR			cccc 01xx x0x0 xxxx xxxx xxxx xxxx xxxx */

	/* 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 */

	DECODE_CUSTOM	(0x0c000000, 0x04000000, prep_emulate_ldr_str),



	DECODE_END

};



static enum kprobe_insn __kprobes

space_cccc_100x(kprobe_opcode_t insn, struct arch_specific_insn *asi)
@@ -1526,7 +1527,7 @@ arm_kprobe_decode_insn(kprobe_opcode_t insn, struct arch_specific_insn *asi) 


	else if ((insn & 0x0c000000) == 0x04000000)



		return space_cccc_01xx(insn, asi);

		return kprobe_decode_insn(insn, asi, arm_cccc_01xx_table, false);



	else if ((insn & 0x0e000000) == 0x08000000)