bpf: Force uprobe bpf program to always return 0

[ Upstream commit f505005bc7426f4309880da94cfbfc37efa225bd ]

As suggested by Andrii make uprobe multi bpf programs to always return 0,
so they can't force uprobe removal.

Keeping the int return type for uprobe_prog_run, because it will be used
in following session changes.

Fixes: 89ae89f53d20 ("bpf: Add multi uprobe link")
Suggested-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Acked-by: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20241108134544.480660-3-jolsa@kernel.org
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c
index 6dbbb3683ab2e9e559c09ef618fb32817c084ace..9cb1c952c3ec42ea9f8ae1c6156acb614ee1e5d7 100644 (file)
--- a/kernel/trace/bpf_trace.c
+++ b/kernel/trace/bpf_trace.c
@@ -3294,7 +3294,6 @@ static int uprobe_prog_run(struct bpf_uprobe *uprobe,
        struct bpf_prog *prog = link->link.prog;
        bool sleepable = prog->sleepable;
        struct bpf_run_ctx *old_run_ctx;
-       int err = 0;
 
        if (link->task && current->mm != link->task->mm)
                return 0;
@@ -3307,7 +3306,7 @@ static int uprobe_prog_run(struct bpf_uprobe *uprobe,
        migrate_disable();
 
        old_run_ctx = bpf_set_run_ctx(&run_ctx.run_ctx);
-       err = bpf_prog_run(link->link.prog, regs);
+       bpf_prog_run(link->link.prog, regs);
        bpf_reset_run_ctx(old_run_ctx);
 
        migrate_enable();
@@ -3316,7 +3315,7 @@ static int uprobe_prog_run(struct bpf_uprobe *uprobe,
                rcu_read_unlock_trace();
        else
                rcu_read_unlock();
-       return err;
+       return 0;
 }
 
 static bool