UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Will Deacon <will.deacon@arm.com>
Reviewed-by: James Morse <james.morse@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:43:22 +09:00 committed by Catalin Marinas
parent 9e98c678c2
commit a872fc8bf0
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,6 +102,10 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p)
if (in_exception_text(probe_addr)) if (in_exception_text(probe_addr))
return -EINVAL; return -EINVAL;
if (search_exception_tables(probe_addr))
return -EINVAL;
if (probe_addr >= (unsigned long) __start_rodata && if (probe_addr >= (unsigned long) __start_rodata &&
probe_addr <= (unsigned long) __end_rodata) probe_addr <= (unsigned long) __end_rodata)
return -EINVAL; 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_start &&
addr < (unsigned long)__idmap_text_end) || addr < (unsigned long)__idmap_text_end) ||
(addr >= (unsigned long)__hyp_text_start && (addr >= (unsigned long)__hyp_text_start &&
addr < (unsigned long)__hyp_text_end) || addr < (unsigned long)__hyp_text_end))
!!search_exception_tables(addr))
return true; return true;
if (!is_kernel_in_hyp_mode()) { if (!is_kernel_in_hyp_mode()) {