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

Commit 72c2bab2 authored by Jon Medhurst's avatar Jon Medhurst Committed by Nicolas Pitre
Browse files

ARM: kprobes: Remove redundant code in space_1111 



The tests to explicitly reject probing CPS, RFE and SRS instructions
are redundant as the default case is now to reject undecoded patterns.

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

arch/arm/kernel/kprobes-decode.c

+5 −9
Original line number Diff line number Diff line
@@ -927,14 +927,6 @@ prep_emulate_rdhi16rdlo12rs8rm0_wflags(kprobe_opcode_t insn, 
static enum kprobe_insn __kprobes

space_1111(kprobe_opcode_t insn, struct arch_specific_insn *asi)

{

	/* CPS mmod == 1 : 1111 0001 0000 xx10 xxxx xxxx xx0x xxxx */

	/* RFE           : 1111 100x x0x1 xxxx xxxx 1010 xxxx xxxx */

	/* SRS           : 1111 100x x1x0 1101 xxxx 0101 xxxx xxxx */

	if ((insn & 0xfff30020) == 0xf1020000 ||

	    (insn & 0xfe500f00) == 0xf8100a00 ||

	    (insn & 0xfe5f0f00) == 0xf84d0500)

		return INSN_REJECTED;



	/* memory hint : 1111 0100 x001 xxxx xxxx xxxx xxxx xxxx : */

	/* PLDI        : 1111 0100 x101 xxxx xxxx xxxx xxxx xxxx : */

	/* PLDW        : 1111 0101 x001 xxxx xxxx xxxx xxxx xxxx : */
@@ -950,8 +942,12 @@ space_1111(kprobe_opcode_t insn, struct arch_specific_insn *asi) 
		return INSN_GOOD_NO_SLOT;

	}



	/* CPS   : 1111 0001 0000 xxx0 xxxx xxxx xx0x xxxx */

	/* SETEND: 1111 0001 0000 0001 xxxx xxxx 0000 xxxx */



	/* SRS   : 1111 100x x1x0 xxxx xxxx xxxx xxxx xxxx */

	/* RFE   : 1111 100x x0x1 xxxx xxxx xxxx xxxx xxxx */



	/* Coprocessor instructions... */

	/* MCRR2 : 1111 1100 0100 xxxx xxxx xxxx xxxx xxxx : (Rd != Rn) */

	/* MRRC2 : 1111 1100 0101 xxxx xxxx xxxx xxxx xxxx : (Rd != Rn) */