[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20210628113045.167127609@infradead.org>
Date: Mon, 28 Jun 2021 13:24:12 +0200
From: Peter Zijlstra <peterz@...radead.org>
To: jpoimboe@...hat.com, jbaron@...mai.com, rostedt@...dmis.org,
ardb@...nel.org, naveen.n.rao@...ux.ibm.com,
anil.s.keshavamurthy@...el.com, mhiramat@...nel.org,
davem@...emloft.net
Cc: linux-kernel@...r.kernel.org, peterz@...radead.org
Subject: [PATCH 3/3] 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.
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@...radead.org>
---
kernel/kprobes.c | 2 ++
1 file changed, 2 insertions(+)
--- 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(str
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;
Powered by blists - more mailing lists