]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
perf/bpf: Robustify perf_event_free_bpf_prog()
authorPeter Zijlstra <peterz@infradead.org>
Mon, 4 Nov 2024 13:39:22 +0000 (14:39 +0100)
committerIngo Molnar <mingo@kernel.org>
Tue, 4 Mar 2025 08:42:59 +0000 (09:42 +0100)
Ensure perf_event_free_bpf_prog() is safe to call a second time;
notably without making any references to event->pmu when there is no
prog left.

Note: perf_event_detach_bpf_prog() might leave a stale event->prog

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Reviewed-by: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Andrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/r/20241104135518.978956692@infradead.org
kernel/events/core.c

index 525c64ee7925b53e81d0cb0aace729df464ffc3b..ab4e497087daf3b6d99e2423d73e023e6c40bcaf 100644 (file)
@@ -10905,6 +10905,9 @@ int perf_event_set_bpf_prog(struct perf_event *event, struct bpf_prog *prog,
 
 void perf_event_free_bpf_prog(struct perf_event *event)
 {
+       if (!event->prog)
+               return;
+
        if (!perf_event_is_tracing(event)) {
                perf_event_free_bpf_handler(event);
                return;