2021-11-23 14:28:08

by Jiri Olsa

Subject: [PATCH] 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.

Fixes: 99c9a923e97a ("tracing/uprobe: Fix double perf_event linking on multiprobe uprobe")
Signed-off-by: Jiri Olsa <[email protected]>
---
kernel/trace/trace_uprobe.c | 1 +
1 file changed, 1 insertion(+)

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);
--
2.32.0

2021-11-24 01:45:33

by Masami Hiramatsu

Subject: Re: [PATCH] tracing/uprobe: Fix uprobe_perf_open probes iteration

On Tue, 23 Nov 2021 15:28:01 +0100
Jiri Olsa <[email protected]> wrote:

> Add missing 'tu' variable initialization in the probes loop,
> otherwise the head 'tu' is used instead of added probes.

Thanks for fixing this bug!

Acked-by: Masami Hiramatsu <[email protected]>

>
> Fixes: 99c9a923e97a ("tracing/uprobe: Fix double perf_event linking on multiprobe uprobe")
> Signed-off-by: Jiri Olsa <[email protected]>
> ---
> kernel/trace/trace_uprobe.c | 1 +
> 1 file changed, 1 insertion(+)
>
> 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);
> --
> 2.32.0
>


--
Masami Hiramatsu <[email protected]>