Skip to content

Commit 0ee288e

Browse files
olsajirianakryiko
authored andcommitted
bpf,perf: Fix perf_event_detach_bpf_prog error handling
Peter reported that perf_event_detach_bpf_prog might skip to release the bpf program for -ENOENT error from bpf_prog_array_copy. This can't happen because bpf program is stored in perf event and is detached and released only when perf event is freed. Let's drop the -ENOENT check and make sure the bpf program is released in any case. Fixes: 170a7e3 ("bpf: bpf_prog_array_copy() should return -ENOENT if exclude_prog not found") Reported-by: Peter Zijlstra <peterz@infradead.org> Signed-off-by: Jiri Olsa <jolsa@kernel.org> Signed-off-by: Andrii Nakryiko <andrii@kernel.org> Link: https://lore.kernel.org/bpf/20241023200352.3488610-1-jolsa@kernel.org Closes: https://lore.kernel.org/lkml/20241022111638.GC16066@noisy.programming.kicks-ass.net/
1 parent 82bbe13 commit 0ee288e

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

kernel/trace/bpf_trace.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2216,8 +2216,6 @@ void perf_event_detach_bpf_prog(struct perf_event *event)
22162216

22172217
old_array = bpf_event_rcu_dereference(event->tp_event->prog_array);
22182218
ret = bpf_prog_array_copy(old_array, event->prog, NULL, 0, &new_array);
2219-
if (ret == -ENOENT)
2220-
goto unlock;
22212219
if (ret < 0) {
22222220
bpf_prog_array_delete_safe(old_array, event->prog);
22232221
} else {

0 commit comments

Comments
 (0)