perf/events/core: fix race in bpf program unregister
PATCH 1/1 perf/events/core: fix race in bpf program unregister
there is a race between perf_event_free_bpf_prog() and free_trace_kprobe():
__free_event()
event->destroy(event)
tp_perf_event_destroy()
perf_trace_destroy()
perf_trace_event_unreg()
which is dropping event->tp_event->perf_refcount and allows to proceed in:
unregister_trace_kprobe()
unregister_kprobe_event()
trace_remove_event_call()
probe_remove_event_call()free_trace_kprobe()
while __free_event does:call_rcu(&event->rcu_head, free_event_rcu);
free_event_rcu()
perf_event_free_bpf_prog()
To fix the race simply move perf_event_free_bpf_prog() before event->destroy(), since event->tp_event is still valid at that point.
Note, perf_trace_destroy() is not racing with trace_remove_event_call() since they both grab event_mutex.
---
Wang, please test the fix to double check.
kernel/events/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/events/core.c +2 -1
@@ -3415,7 +3415,6 @@ static void free_event_rcu(struct rcu_head *head)if (event->ns)put_pid_ns (event->ns);perf_event_free_filter (event); -perf_event_free_bpf_prog (event);kfree (event); }
@@ -3546,6 +3545,8 @@ static void __free_event(struct perf_event *event)put_callchain_buffers (); } +perf_event_free_bpf_prog (event); +if (event->destroy) event->destroy (event);
Signature · 1 line
1.7.9.5
Quoted 24 lines · Alexei Starovoitov
there is a race between
perf_event_free_bpf_prog()andfree_trace_kprobe():
__free_event()
event->destroy(event)
tp_perf_event_destroy()
perf_trace_destroy()
perf_trace_event_unreg()which is dropping
event->tp_event->perf_refcountand allows to proceed in:
unregister_trace_kprobe()
unregister_kprobe_event()
trace_remove_event_call()
probe_remove_event_call()free_trace_kprobe()while
__free_eventdoes:call_rcu(&event->rcu_head, free_event_rcu);
free_event_rcu()
perf_event_free_bpf_prog()To fix the race simply move
perf_event_free_bpf_prog()beforeevent->destroy(), sinceevent->tp_eventis still valid at that point.
Quoted 6 lines
Note,
perf_trace_destroy()is not racing withtrace_remove_event_call()since they both grabevent_mutex.Fixes 2541517c32be ("tracing, perf: Implement BPF programs attached to kprobes")Reported-by Wang Nan <[email protected]>Signed-off-by Alexei Starovoitov <[email protected]>
ping.
This is needed in 4.1.
Peter Zijlstra
maintainerQuoted 28 lines · Alexei Starovoitov
Quoted 27 lines · Alexei Starovoitov
there is a race between
perf_event_free_bpf_prog()andfree_trace_kprobe():
__free_event()
event->destroy(event)
tp_perf_event_destroy()
perf_trace_destroy()
perf_trace_event_unreg()which is dropping
event->tp_event->perf_refcountand allows to proceed in:
unregister_trace_kprobe()
unregister_kprobe_event()
trace_remove_event_call()
probe_remove_event_call()free_trace_kprobe()while
__free_eventdoes:call_rcu(&event->rcu_head, free_event_rcu);
free_event_rcu()
perf_event_free_bpf_prog()To fix the race simply move
perf_event_free_bpf_prog()beforeevent->destroy(), sinceevent->tp_eventis still valid at that point.Note,
perf_trace_destroy()is not racing withtrace_remove_event_call()since they both grabevent_mutex.
Quoted 6 lines
Quoted 3 lines
Fixes 2541517c32be ("tracing, perf: Implement BPF programs attached to kprobes")Reported-by Wang Nan <[email protected]>Signed-off-by Alexei Starovoitov <[email protected]>ping.
This is needed in 4.1.
Thanks, queued for perf/urgent.
tip-bot for Alexei Starovoitov
merge bot[tip:perf/core] perf: Fix race in BPF program unregister
In reply to Alexei Starovoitovperf: Fix race in BPF program unregister
Commit-ID: dead9f29ddcc69551f35529a252d2704047870d3 Gitweb: http://git.kernel.org/tip/dead9f29ddcc69551f35529a252d2704047870d3 Author: Alexei Starovoitov <[email protected]> AuthorDate: Fri, 15 May 2015 12:15:21 -0700 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 27 May 2015 08:46:15 +0200
perf: Fix race in BPF program unregister
there is a race between perf_event_free_bpf_prog() and free_trace_kprobe():
__free_event() event->destroy(event) tp_perf_event_destroy() perf_trace_destroy() perf_trace_event_unreg()
which is dropping event->tp_event->perf_refcount and allows to proceed in:
unregister_trace_kprobe()
unregister_kprobe_event()
trace_remove_event_call()
probe_remove_event_call()
free_trace_kprobe()
while __free_event does:
call_rcu(&event->rcu_head, free_event_rcu); free_event_rcu() perf_event_free_bpf_prog()
To fix the race simply move perf_event_free_bpf_prog() before event->destroy(), since event->tp_event is still valid at that point.
Note, perf_trace_destroy() is not racing with trace_remove_event_call() since they both grab event_mutex.
--- kernel/events/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/events/core.c +2 -1
@@ -3442,7 +3442,6 @@ static void free_event_rcu(struct rcu_head *head)if (event->ns)put_pid_ns (event->ns);perf_event_free_filter (event); -perf_event_free_bpf_prog (event);kfree (event); }
@@ -3573,6 +3572,8 @@ static void __free_event(struct perf_event *event)put_callchain_buffers (); } +perf_event_free_bpf_prog (event); +if (event->destroy) event->destroy (event);