From: Muchun Song <songmuc...@bytedance.com>
[ Upstream commit b0399092ccebd9feef68d4ceb8d6219a8c0caa05 ]
If a kprobe is marked as gone, we should not kill it again. Otherwise, we
can disarm the kprobe more than once. In that case, the statistics of
kprobe_ftrace_enabled can unbalance which can lead to that kprobe do not
work.
Fixes: e8386a0cb22f ("kprobes: support probing module __exit function")
Co-developed-by: Chengming Zhou <zhouchengm...@bytedance.com>
Signed-off-by: Muchun Song <songmuc...@bytedance.com>
Signed-off-by: Chengming Zhou <zhouchengm...@bytedance.com>
Signed-off-by: Andrew Morton <a...@linux-foundation.org>
Acked-by: Masami Hiramatsu <mhira...@kernel.org>
Cc: "Naveen N . Rao" <naveen.n....@linux.ibm.com>
Cc: Anil S Keshavamurthy <anil.s.keshavamur...@intel.com>
Cc: David S. Miller <da...@davemloft.net>
Cc: Song Liu <songliubrav...@fb.com>
Cc: Steven Rostedt <rost...@goodmis.org>
Cc: <sta...@vger.kernel.org>
Link: https://lkml.kernel.org/r/20200822030055.32383-1-songmuc...@bytedance.com
Signed-off-by: Linus Torvalds <torva...@linux-foundation.org>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
kernel/kprobes.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index eb4bffe6d764d..230d9d599b5aa 100644
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -2061,6 +2061,9 @@ static void kill_kprobe(struct kprobe *p)
{
struct kprobe *kp;
+ if (WARN_ON_ONCE(kprobe_gone(p)))
+ return;
+
p->flags |= KPROBE_FLAG_GONE;
if (kprobe_aggrprobe(p)) {
/*
@@ -2243,7 +2246,10 @@ static int kprobes_module_callback(struct notifier_block
*nb,
mutex_lock(&kprobe_mutex);
for (i = 0; i < KPROBE_TABLE_SIZE; i++) {
head = &kprobe_table[i];
- hlist_for_each_entry_rcu(p, head, hlist)
+ hlist_for_each_entry_rcu(p, head, hlist) {
+ if (kprobe_gone(p))
+ continue;
+
if (within_module_init((unsigned long)p->addr, mod) ||
(checkcore &&
within_module_core((unsigned long)p->addr, mod))) {
@@ -2260,6 +2266,7 @@ static int kprobes_module_callback(struct notifier_block
*nb,
*/
kill_kprobe(p);
}
+ }
}
mutex_unlock(&kprobe_mutex);
return NOTIFY_DONE;
--
2.25.1
