diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2021-06-28 13:24:12 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2021-07-05 10:47:16 +0200 |
| commit | fa68bd09fc62240a383c0c601d3349c47db10c34 (patch) | |
| tree | 2cd9362e57b77cab1143a0c7d15216ba39d53970 /kernel | |
| parent | static_call: Fix static_call_text_reserved() vs __init (diff) | |
| download | linux-fa68bd09fc62240a383c0c601d3349c47db10c34.tar.xz linux-fa68bd09fc62240a383c0c601d3349c47db10c34.zip | |
kprobe/static_call: Restore missing static_call_text_reserved()
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>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/kprobes.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/kprobes.c b/kernel/kprobes.c index e41385afe79d..069388d26e3c 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> @@ -1551,6 +1552,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; |