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

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

arm64: kprobes: Move exception_text check in blacklist 



Move exception/irqentry text address check in blacklist,
since those are symbol based rejection.

If we prohibit probing on the symbols in exception_text,
those should be blacklisted.

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 b5586163

arch/arm64/kernel/probes/kprobes.c

+2 −4
Original line number Diff line number Diff line
@@ -98,9 +98,6 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p) 
	/* copy instruction */

	p->opcode = le32_to_cpu(*p->addr);



	if (in_exception_text(probe_addr))

		return -EINVAL;



	if (search_exception_tables(probe_addr))

		return -EINVAL;
@@ -483,7 +480,8 @@ bool arch_within_kprobe_blacklist(unsigned long addr) 
	    (addr >= (unsigned long)__idmap_text_start &&

	    addr < (unsigned long)__idmap_text_end) ||

	    (addr >= (unsigned long)__hyp_text_start &&

	    addr < (unsigned long)__hyp_text_end))

	    addr < (unsigned long)__hyp_text_end) ||

	    in_exception_text(addr))

		return true;



	if (!is_kernel_in_hyp_mode()) {