Skip to content

Commit 6036bcc

Browse files
thejhOpenEmbedded
authored andcommitted
bpf: Fix UAF via mismatching bpf_prog/attachment RCU flavors
commit ef1b808 upstream. 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 <[email protected]> Suggested-by: Alexei Starovoitov <[email protected]> Signed-off-by: Jann Horn <[email protected]> Signed-off-by: Andrii Nakryiko <[email protected]> Cc: [email protected] Link: https://lore.kernel.org/bpf/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent c39feea commit 6036bcc

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
@@ -2182,6 +2182,13 @@ void perf_event_detach_bpf_prog(struct perf_event *event)
21822182
bpf_prog_array_free_sleepable(old_array);
21832183
}
21842184

2185+
/*
2186+
* It could be that the bpf_prog is not sleepable (and will be freed
2187+
* via normal RCU), but is called from a point that supports sleepable
2188+
* programs and uses tasks-trace-RCU.
2189+
*/
2190+
synchronize_rcu_tasks_trace();
2191+
21852192
bpf_prog_put(event->prog);
21862193
event->prog = NULL;
21872194

0 commit comments

Comments
 (0)