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

Commit b5586163 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Catalin Marinas
Browse files

arm64: kprobes: Remove unneeded RODATA check 



Remove unneeded RODATA check from arch_prepare_kprobe().

Since check_kprobe_address_safe() already ensured that
the probe address is in kernel text, we don't need to
check whether the address in RODATA or not. That must
be always false.

Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent a872fc8b

arch/arm64/kernel/probes/kprobes.c

+0 −6
Original line number Diff line number Diff line
@@ -91,8 +91,6 @@ static void __kprobes arch_simulate_insn(struct kprobe *p, struct pt_regs *regs) 
int __kprobes arch_prepare_kprobe(struct kprobe *p)

{

	unsigned long probe_addr = (unsigned long)p->addr;

	extern char __start_rodata[];

	extern char __end_rodata[];



	if (probe_addr & 0x3)

		return -EINVAL;
@@ -106,10 +104,6 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p) 
	if (search_exception_tables(probe_addr))

		return -EINVAL;



	if (probe_addr >= (unsigned long) __start_rodata &&

	    probe_addr <= (unsigned long) __end_rodata)

		return -EINVAL;



	/* decode instruction */

	switch (arm_kprobe_decode_insn(p->addr, &p->ainsn)) {

	case INSN_REJECTED:	/* insn not supported */