projects/linux·commit 29889216

Merge tag 'trace-v5.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace

29889216 · Linus Torvalds <[email protected]> · 2021-11-24 09:51:22 -08:00

Pull tracing fix from Steven Rostedt:
 "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"

* tag 'trace-v5.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
  tracing/uprobe: Fix uprobe_perf_open probes iteration
Commit
29889216befc1cee635da8a64f48caae47ffbcaf
Parents
740bebf4 · 1880ed71

Merge commit. Changes below are compared with the first parent: 740bebf4.

Changes

1 files changed · +1 −0

FileStatusAddDelContent
kernel/trace/trace_uprobe.cmodified+1−0View file

kernel/trace/trace_uprobe.c

View file
diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
index 0a5c0db..f5f0039 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);