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 08/17] kprobes: fix compilation without CONFIG_KRETPROBES
    From
    kprobe_on_func_entry and arch_kprobe_on_func_entry need to be available
    even if CONFIG_KRETPROBES is not selected.

    Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
    Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
    Reviewed-by: Kees Cook <keescook@chromium.org>
    ---
    kernel/kprobes.c | 38 +++++++++++++++++++-------------------
    1 file changed, 19 insertions(+), 19 deletions(-)

    diff --git a/kernel/kprobes.c b/kernel/kprobes.c
    index 53534aa258a6..b5e20a4669b8 100644
    --- a/kernel/kprobes.c
    +++ b/kernel/kprobes.c
    @@ -1829,6 +1829,25 @@ unsigned long __weak arch_deref_entry_point(void *entry)
    return (unsigned long)entry;
    }

    +bool __weak arch_kprobe_on_func_entry(unsigned long offset)
    +{
    + return !offset;
    +}
    +
    +bool kprobe_on_func_entry(kprobe_opcode_t *addr, const char *sym, unsigned long offset)
    +{
    + kprobe_opcode_t *kp_addr = _kprobe_addr(addr, sym, offset);
    +
    + if (IS_ERR(kp_addr))
    + return false;
    +
    + if (!kallsyms_lookup_size_offset((unsigned long)kp_addr, NULL, &offset) ||
    + !arch_kprobe_on_func_entry(offset))
    + return false;
    +
    + return true;
    +}
    +
    #ifdef CONFIG_KRETPROBES
    /*
    * This kprobe pre_handler is registered with every kretprobe. When probe
    @@ -1885,25 +1904,6 @@ static int pre_handler_kretprobe(struct kprobe *p, struct pt_regs *regs)
    }
    NOKPROBE_SYMBOL(pre_handler_kretprobe);

    -bool __weak arch_kprobe_on_func_entry(unsigned long offset)
    -{
    - return !offset;
    -}
    -
    -bool kprobe_on_func_entry(kprobe_opcode_t *addr, const char *sym, unsigned long offset)
    -{
    - kprobe_opcode_t *kp_addr = _kprobe_addr(addr, sym, offset);
    -
    - if (IS_ERR(kp_addr))
    - return false;
    -
    - if (!kallsyms_lookup_size_offset((unsigned long)kp_addr, NULL, &offset) ||
    - !arch_kprobe_on_func_entry(offset))
    - return false;
    -
    - return true;
    -}
    -
    int register_kretprobe(struct kretprobe *rp)
    {
    int ret = 0;
    --
    2.24.0.rc1.363.gb1bccd3e3d-goog
    \
     
     \ /
      Last update: 2019-11-01 23:13    [W:4.288 / U:0.516 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site