Skip to content

Commit ef1b808

Browse files
thejhanakryiko
authored andcommitted
bpf: Fix UAF via mismatching bpf_prog/attachment RCU flavors
Uprobes always use bpf_prog_run_array_uprobe() under tasks-trace-RCU protection. But it is possible to attach a non-sleepable BPF program to a uprobe, and non-sleepable BPF programs are freed via normal RCU (see __bpf_prog_put_noref()). This leads to UAF of the bpf_prog because a normal RCU grace period does not imply a tasks-trace-RCU grace period. Fix it by explicitly waiting for a tasks-trace-RCU grace period after removing the attachment of a bpf_prog to a perf_event. Fixes: 8c7dcb8 ("bpf: implement sleepable uprobes by chaining gps") Suggested-by: Andrii Nakryiko <andrii@kernel.org> Suggested-by: Alexei Starovoitov <ast@kernel.org> Signed-off-by: Jann Horn <jannh@google.com> Signed-off-by: Andrii Nakryiko <andrii@kernel.org> Cc: stable@vger.kernel.org Link: https://lore.kernel.org/bpf/20241210-bpf-fix-actual-uprobe-uaf-v1-1-19439849dd44@google.com
1 parent 11d5245 commit ef1b808

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

kernel/trace/bpf_trace.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2258,6 +2258,13 @@ void perf_event_detach_bpf_prog(struct perf_event *event)
22582258
bpf_prog_array_free_sleepable(old_array);
22592259
}
22602260

2261+
/*
2262+
* It could be that the bpf_prog is not sleepable (and will be freed
2263+
* via normal RCU), but is called from a point that supports sleepable
2264+
* programs and uses tasks-trace-RCU.
2265+
*/
2266+
synchronize_rcu_tasks_trace();
2267+
22612268
bpf_prog_put(event->prog);
22622269
event->prog = NULL;
22632270

0 commit comments

Comments
 (0)