Skip to content

Commit

Permalink
bpf: Fix UAF via mismatching bpf_prog/attachment RCU flavors
Browse files Browse the repository at this point in the history
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.

Cc: [email protected]
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]>
  • Loading branch information
thejh authored and Kernel Patches Daemon committed Dec 10, 2024
1 parent 05fce66 commit 1b0b22b
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions kernel/trace/bpf_trace.c
Original file line number Diff line number Diff line change
Expand Up @@ -2261,6 +2261,13 @@ void perf_event_detach_bpf_prog(struct perf_event *event)
bpf_prog_array_free_sleepable(old_array);
}

/*
* It could be that the bpf_prog is not sleepable (and will be freed
* via normal RCU), but is called from a point that supports sleepable
* programs and uses tasks-trace-RCU.
*/
synchronize_rcu_tasks_trace();

bpf_prog_put(event->prog);
event->prog = NULL;

Expand Down

0 comments on commit 1b0b22b

Please sign in to comment.