leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm64: kprobes: Move exception_text check in blacklist

Browse Source 
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: Will Deacon <will.deacon@arm.com>
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
This commit is contained in:
Masami Hiramatsu 2019-02-13 00:44:19 +09:00 committed by Catalin Marinas
parent b5586163de
commit 6e08af0f10
1 changed files with 2 additions and 4 deletions

6
arch/arm64/kernel/probes/kprobes.c
View File

@ -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()) {