lkml.org 
[lkml]   [2019]   [Nov]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH v4 09/17] arm64: kprobes: fix kprobes without CONFIG_KRETPROBES
    From
    This allows CONFIG_KRETPROBES to be disabled without disabling
    kprobes entirely.

    Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
    Reviewed-by: Kees Cook <keescook@chromium.org>
    ---
    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.rc1.363.gb1bccd3e3d-goog
    \
     
     \ /
      Last update: 2019-11-01 23:13    [W:3.654 / U:0.436 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site