lkml.org 
[lkml]   [2021]   [Jul]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 341/351] kprobe/static_call: Restore missing static_call_text_reserved()
    Date
    From: Peter Zijlstra <peterz@infradead.org>

    [ Upstream commit fa68bd09fc62240a383c0c601d3349c47db10c34 ]

    Restore two hunks from commit:

    6333e8f73b83 ("static_call: Avoid kprobes on inline static_call()s")

    that went walkabout in a Git merge commit.

    Fixes: 76d4acf22b48 ("Merge tag 'perf-kprobes-2020-12-14' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip")
    Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
    Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
    Link: https://lore.kernel.org/r/20210628113045.167127609@infradead.org
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    kernel/kprobes.c | 2 ++
    1 file changed, 2 insertions(+)

    diff --git a/kernel/kprobes.c b/kernel/kprobes.c
    index 745f08fdd7a6..c6b4c66b8fa2 100644
    --- a/kernel/kprobes.c
    +++ b/kernel/kprobes.c
    @@ -35,6 +35,7 @@
    #include <linux/ftrace.h>
    #include <linux/cpu.h>
    #include <linux/jump_label.h>
    +#include <linux/static_call.h>
    #include <linux/perf_event.h>

    #include <asm/sections.h>
    @@ -1569,6 +1570,7 @@ static int check_kprobe_address_safe(struct kprobe *p,
    if (!kernel_text_address((unsigned long) p->addr) ||
    within_kprobe_blacklist((unsigned long) p->addr) ||
    jump_label_text_reserved(p->addr, p->addr) ||
    + static_call_text_reserved(p->addr, p->addr) ||
    find_bug((unsigned long)p->addr)) {
    ret = -EINVAL;
    goto out;
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-19 19:49    [W:2.175 / U:0.904 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site