[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20211124100956.6905a198@gandalf.local.home>
Date: Wed, 24 Nov 2021 10:09:56 -0500
From: Steven Rostedt <rostedt@...dmis.org>
To: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: LKML <linux-kernel@...r.kernel.org>,
Ingo Molnar <mingo@...nel.org>,
Andrew Morton <akpm@...ux-foundation.org>,
Jiri Olsa <jolsa@...hat.com>,
Masami Hiramatsu <mhiramat@...nel.org>
Subject: [GIT PULL] tracing/uprobe: Fix uprobe_perf_open probes iteration
Linus,
tracing: Fix wrong uprobe variable in iterator
uprobe_perf_open() processes a list of probes, but due to a missing
setting of the uprobe to be processed, the loop processes the head probe
instead of the added probes.
Please pull the latest trace-v5.16-rc2 tree, which can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git
trace-v5.16-rc2
Tag SHA1: b035fc0d660c88f1ec940aba668d438c96ea1a5c
Head SHA1: 1880ed71ce863318c1ce93bf324876fb5f92854f
Jiri Olsa (1):
tracing/uprobe: Fix uprobe_perf_open probes iteration
----
kernel/trace/trace_uprobe.c | 1 +
1 file changed, 1 insertion(+)
---------------------------
commit 1880ed71ce863318c1ce93bf324876fb5f92854f
Author: Jiri Olsa <jolsa@...hat.com>
Date: Tue Nov 23 15:28:01 2021 +0100
tracing/uprobe: Fix uprobe_perf_open probes iteration
Add missing 'tu' variable initialization in the probes loop,
otherwise the head 'tu' is used instead of added probes.
Link: https://lkml.kernel.org/r/20211123142801.182530-1-jolsa@kernel.org
Cc: stable@...r.kernel.org
Fixes: 99c9a923e97a ("tracing/uprobe: Fix double perf_event linking on multiprobe uprobe")
Acked-by: Masami Hiramatsu <mhiramat@...nel.org>
Signed-off-by: Jiri Olsa <jolsa@...nel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@...dmis.org>
diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
index 0a5c0db3137e..f5f0039d31e5 100644
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@ -1313,6 +1313,7 @@ static int uprobe_perf_open(struct trace_event_call *call,
return 0;
list_for_each_entry(pos, trace_probe_probe_list(tp), list) {
+ tu = container_of(pos, struct trace_uprobe, tp);
err = uprobe_apply(tu->inode, tu->offset, &tu->consumer, true);
if (err) {
uprobe_perf_close(call, event);
Powered by blists - more mailing lists