[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20230703071640.106204-1-zegao@tencent.com>
Date: Mon, 3 Jul 2023 15:16:40 +0800
From: Ze Gao <zegao2021@...il.com>
To: Masami Hiramatsu <mhiramat@...nel.org>
Cc: Steven Rostedt <rostedt@...dmis.org>, Ze Gao <zegao2021@...il.com>,
linux-kernel@...r.kernel.org, linux-trace-kernel@...r.kernel.org,
Ze Gao <zegao@...cent.com>, Yafang <laoar.shao@...il.com>
Subject: [PATCH] fprobe: add unlock to match a succeeded ftrace_test_recursion_trylock
Fixes: 3cc4e2c5fbae ("fprobe: make fprobe_kprobe_handler recursion free")
Reported-by: Yafang <laoar.shao@...il.com>
Closes: https://lore.kernel.org/linux-trace-kernel/CALOAHbC6UpfFOOibdDiC7xFc5YFUgZnk3MZ=3Ny6we=AcrNbew@mail.gmail.com/
Signed-off-by: Ze Gao <zegao@...cent.com>
---
kernel/trace/fprobe.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/kernel/trace/fprobe.c b/kernel/trace/fprobe.c
index 18d36842faf5..93b3e361bb97 100644
--- a/kernel/trace/fprobe.c
+++ b/kernel/trace/fprobe.c
@@ -102,12 +102,14 @@ static void fprobe_kprobe_handler(unsigned long ip, unsigned long parent_ip,
if (unlikely(kprobe_running())) {
fp->nmissed++;
- return;
+ goto recursion_unlock;
}
kprobe_busy_begin();
__fprobe_handler(ip, parent_ip, ops, fregs);
kprobe_busy_end();
+
+recursion_unlock:
ftrace_test_recursion_unlock(bit);
}
--
2.40.1
Powered by blists - more mailing lists