Commit d2f7eca6 authored by Fredrik Strupe's avatar Fredrik Strupe Committed by Russell King
Browse files

ARM: 9071/1: uprobes: Don't hook on thumb instructions 



Since uprobes is not supported for thumb, check that the thumb bit is
not set when matching the uprobes instruction hooks.

The Arm UDF instructions used for uprobes triggering
(UPROBE_SWBP_ARM_INSN and UPROBE_SS_ARM_INSN) coincidentally share the
same encoding as a pair of unallocated 32-bit thumb instructions (not
UDF) when the condition code is 0b1111 (0xf). This in effect makes it
possible to trigger the uprobes functionality from thumb, and at that
using two unallocated instructions which are not permanently undefined.

Signed-off-by: default avatarFredrik Strupe <fredrik@strupe.net>
Cc: stable@vger.kernel.org
Fixes: c7edc9e3 ("ARM: add uprobes support")
Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
parent 30e3b4f2

arch/arm/probes/uprobes/core.c

+2 −2
Original line number Diff line number Diff line
@@ -204,7 +204,7 @@ unsigned long uprobe_get_swbp_addr(struct pt_regs *regs) 
static struct undef_hook uprobes_arm_break_hook = {

	.instr_mask	= 0x0fffffff,

	.instr_val	= (UPROBE_SWBP_ARM_INSN & 0x0fffffff),

	.cpsr_mask	= MODE_MASK,

	.cpsr_mask	= (PSR_T_BIT | MODE_MASK),

	.cpsr_val	= USR_MODE,

	.fn		= uprobe_trap_handler,

};
@@ -212,7 +212,7 @@ static struct undef_hook uprobes_arm_break_hook = { 
static struct undef_hook uprobes_arm_ss_hook = {

	.instr_mask	= 0x0fffffff,

	.instr_val	= (UPROBE_SS_ARM_INSN & 0x0fffffff),

	.cpsr_mask	= MODE_MASK,

	.cpsr_mask	= (PSR_T_BIT | MODE_MASK),

	.cpsr_val	= USR_MODE,

	.fn		= uprobe_trap_handler,

};