Messages in this thread | | | Date | Thu, 31 Oct 2019 20:56:11 -0700 | From | Kees Cook <> | Subject | Re: [PATCH v3 09/17] arm64: kprobes: fix kprobes without CONFIG_KRETPROBES |
| |
On Thu, Oct 31, 2019 at 09:46:29AM -0700, samitolvanen@google.com wrote: > This allows CONFIG_KRETPROBES to be disabled without disabling > kprobes entirely. > > Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
Is this worth folding this into the prior kprobes patch? Regardless:
Reviewed-by: Kees Cook <keescook@chromium.org>
-Kees
> --- > arch/arm64/kernel/probes/kprobes.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/arch/arm64/kernel/probes/kprobes.c b/arch/arm64/kernel/probes/kprobes.c > index c4452827419b..98230ae979ca 100644 > --- a/arch/arm64/kernel/probes/kprobes.c > +++ b/arch/arm64/kernel/probes/kprobes.c > @@ -551,6 +551,7 @@ void __kprobes __used *trampoline_probe_handler(struct pt_regs *regs) > return (void *)orig_ret_address; > } > > +#ifdef CONFIG_KRETPROBES > void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri, > struct pt_regs *regs) > { > @@ -564,6 +565,7 @@ int __kprobes arch_trampoline_kprobe(struct kprobe *p) > { > return 0; > } > +#endif > > int __init arch_init_kprobes(void) > { > -- > 2.24.0.rc0.303.g954a862665-goog >
-- Kees Cook
| |