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

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

arm64: kprobes: Move extable address check into arch_prepare_kprobe() 



Move extable address check into arch_prepare_kprobe() from
arch_within_kprobe_blacklist().
The blacklist is exposed via debugfs as a list of symbols.
The extable entries are smaller, so must be filtered out
by arch_prepare_kprobe().

Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Reviewed-by: default avatarJames Morse <james.morse@arm.com>
Signed-off-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 9e98c678

arch/arm64/kernel/probes/kprobes.c

+5 −2
Original line number Diff line number Diff line
@@ -102,6 +102,10 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p) 


	if (in_exception_text(probe_addr))

		return -EINVAL;



	if (search_exception_tables(probe_addr))

		return -EINVAL;



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

	    probe_addr <= (unsigned long) __end_rodata)

		return -EINVAL;
@@ -485,8 +489,7 @@ 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) ||

	    !!search_exception_tables(addr))

	    addr < (unsigned long)__hyp_text_end))

		return true;



	if (!is_kernel_in_hyp_mode()) {