Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1415600
| From | Masami Hiramatsu <mhiramat@kernel.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: [PATCH v13 06/10] arm64: Treat all entry code as non-kprobe-able |
| Date | 2016-06-07 02:40 +0200 |
| Message-ID | <rHddM-3KJ-3@gated-at.bofh.it> (permalink) |
| References | <rFNY5-6k1-1@gated-at.bofh.it> <rFNY6-6k1-7@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
On Thu, 2 Jun 2016 23:26:20 -0400
David Long <dave.long@linaro.org> wrote:
> From: Pratyush Anand <panand@redhat.com>
>
> Entry symbols are not kprobe safe. So blacklist them for kprobing.
>
> Signed-off-by: Pratyush Anand <panand@redhat.com>
> Signed-off-by: David A. Long <dave.long@linaro.org>
Looks good to me.
Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
> ---
> arch/arm64/kernel/entry.S | 3 +++
> arch/arm64/kernel/kprobes.c | 26 ++++++++++++++++++++++++++
> arch/arm64/kernel/vmlinux.lds.S | 1 +
> 3 files changed, 30 insertions(+)
>
> diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
> index 12e8d2b..7d99bed 100644
> --- a/arch/arm64/kernel/entry.S
> +++ b/arch/arm64/kernel/entry.S
> @@ -243,6 +243,7 @@ tsk .req x28 // current thread_info
> * Exception vectors.
> */
>
> + .pushsection ".entry.text", "ax"
> .align 11
> ENTRY(vectors)
> ventry el1_sync_invalid // Synchronous EL1t
> @@ -781,3 +782,5 @@ ENTRY(sys_rt_sigreturn_wrapper)
> mov x0, sp
> b sys_rt_sigreturn
> ENDPROC(sys_rt_sigreturn_wrapper)
> +
> + .popsection
> diff --git a/arch/arm64/kernel/kprobes.c b/arch/arm64/kernel/kprobes.c
> index 49b06cf..ba43623 100644
> --- a/arch/arm64/kernel/kprobes.c
> +++ b/arch/arm64/kernel/kprobes.c
> @@ -30,6 +30,7 @@
> #include <asm/insn.h>
> #include <asm/uaccess.h>
> #include <asm/irq.h>
> +#include <asm-generic/sections.h>
>
> #include "kprobes-arm64.h"
>
> @@ -520,6 +521,31 @@ int __kprobes longjmp_break_handler(struct kprobe *p, struct pt_regs *regs)
> return 1;
> }
>
> +bool arch_within_kprobe_blacklist(unsigned long addr)
> +{
> + extern char __idmap_text_start[], __idmap_text_end[];
> + extern char __hyp_idmap_text_start[], __hyp_idmap_text_end[];
> +
> + if ((addr >= (unsigned long)__kprobes_text_start &&
> + addr < (unsigned long)__kprobes_text_end) ||
> + (addr >= (unsigned long)__entry_text_start &&
> + addr < (unsigned long)__entry_text_end) ||
> + (addr >= (unsigned long)__idmap_text_start &&
> + addr < (unsigned long)__idmap_text_end) ||
> + !!search_exception_tables(addr))
> + return true;
> +
> + if (!is_kernel_in_hyp_mode()) {
> + if ((addr >= (unsigned long)__hyp_text_start &&
> + addr < (unsigned long)__hyp_text_end) ||
> + (addr >= (unsigned long)__hyp_idmap_text_start &&
> + addr < (unsigned long)__hyp_idmap_text_end))
> + return true;
> + }
> +
> + return false;
> +}
> +
> int __init arch_init_kprobes(void)
> {
> return 0;
> diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S
> index 075ce32..9f59394 100644
> --- a/arch/arm64/kernel/vmlinux.lds.S
> +++ b/arch/arm64/kernel/vmlinux.lds.S
> @@ -118,6 +118,7 @@ SECTIONS
> __exception_text_end = .;
> IRQENTRY_TEXT
> SOFTIRQENTRY_TEXT
> + ENTRY_TEXT
> TEXT_TEXT
> SCHED_TEXT
> LOCK_TEXT
> --
> 2.5.0
>
--
Masami Hiramatsu <mhiramat@kernel.org>
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v13 00/10] arm64: Add kernel probes (kprobes) support David Long <dave.long@linaro.org> - 2016-06-03 05:30 +0200
[PATCH v13 04/10] arm64: Blacklist non-kprobe-able symbol David Long <dave.long@linaro.org> - 2016-06-03 05:30 +0200
Re: [PATCH v13 04/10] arm64: Blacklist non-kprobe-able symbol Masami Hiramatsu <mhiramat@kernel.org> - 2016-06-04 05:50 +0200
Re: [PATCH v13 04/10] arm64: Blacklist non-kprobe-able symbol David Long <dave.long@linaro.org> - 2016-06-07 06:00 +0200
Re: [PATCH v13 04/10] arm64: Blacklist non-kprobe-able symbol David Long <dave.long@linaro.org> - 2016-06-10 21:20 +0200
[PATCH v13 06/10] arm64: Treat all entry code as non-kprobe-able David Long <dave.long@linaro.org> - 2016-06-03 05:30 +0200
Re: [PATCH v13 06/10] arm64: Treat all entry code as non-kprobe-able Masami Hiramatsu <mhiramat@kernel.org> - 2016-06-07 02:40 +0200
[PATCH v13 10/10] kprobes: Add arm64 case in kprobe example module David Long <dave.long@linaro.org> - 2016-06-03 05:30 +0200
Re: [PATCH v13 10/10] kprobes: Add arm64 case in kprobe example module Masami Hiramatsu <mhiramat@kernel.org> - 2016-06-07 12:20 +0200
[PATCH v13 03/10] arm64: add conditional instruction simulation support David Long <dave.long@linaro.org> - 2016-06-03 05:30 +0200
Re: [PATCH v13 03/10] arm64: add conditional instruction simulation support Masami Hiramatsu <mhiramat@kernel.org> - 2016-06-04 06:00 +0200
[PATCH v13 05/10] arm64: Kprobes with single stepping support David Long <dave.long@linaro.org> - 2016-06-03 05:30 +0200
Re: [PATCH v13 05/10] arm64: Kprobes with single stepping support Masami Hiramatsu <mhiramat@kernel.org> - 2016-06-08 03:10 +0200
[PATCH v13 01/10] arm64: Add HAVE_REGS_AND_STACK_ACCESS_API feature David Long <dave.long@linaro.org> - 2016-06-03 05:30 +0200
Re: [PATCH v13 01/10] arm64: Add HAVE_REGS_AND_STACK_ACCESS_API feature Masami Hiramatsu <mhiramat@kernel.org> - 2016-06-03 13:40 +0200
[PATCH v13 02/10] arm64: Add more test functions to insn.c David Long <dave.long@linaro.org> - 2016-06-03 05:30 +0200
Re: [PATCH v13 02/10] arm64: Add more test functions to insn.c Masami Hiramatsu <mhiramat@kernel.org> - 2016-06-08 03:20 +0200
Re: [PATCH v13 02/10] arm64: Add more test functions to insn.c David Long <dave.long@linaro.org> - 2016-06-10 17:00 +0200
[PATCH v13 09/10] arm64: Add kernel return probes support (kretprobes) David Long <dave.long@linaro.org> - 2016-06-03 05:40 +0200
Re: [PATCH v13 09/10] arm64: Add kernel return probes support (kretprobes) Masami Hiramatsu <mhiramat@kernel.org> - 2016-06-07 12:30 +0200
[PATCH v13 08/10] arm64: Add trampoline code for kretprobes David Long <dave.long@linaro.org> - 2016-06-03 05:40 +0200
Re: [PATCH v13 08/10] arm64: Add trampoline code for kretprobes Masami Hiramatsu <mhiramat@kernel.org> - 2016-06-07 12:40 +0200
[PATCH v13 07/10] arm64: kprobes instruction simulation support David Long <dave.long@linaro.org> - 2016-06-03 05:40 +0200
csiph-web