Commit 46f7ed32 authored Nov 03, 2024 by Kumar Kartikeya Dwivedi Committed by Alexei Starovoitov Nov 03, 2024

bpf: Tighten tail call checks for lingering locks, RCU, preempt_disable

There are three situations when a program logically exits and transfers
control to the kernel or another program: bpf_throw, BPF_EXIT, and tail
calls. The former two check for any lingering locks and references, but
tail calls currently do not. Expand the checks to check for spin locks,
RCU read sections and preempt disabled sections.

Spin locks are indirectly preventing tail calls as function calls are
disallowed, but the checks for preemption and RCU are more relaxed,
hence ensure tail calls are prevented in their presence.

Fixes: 9bb00b28 ("bpf: Add kfunc bpf_rcu_read_lock/unlock()")
Fixes: fc7566ad ("bpf: Introduce bpf_preempt_[disable,enable] kfuncs")
Signed-off-by: Kumar Kartikeya Dwivedi <memxor@gmail.com>
Link: https://lore.kernel.org/r/20241103225940.1408302-2-memxor@gmail.com

Signed-off-by: Alexei Starovoitov <ast@kernel.org>

parent 77017b9c

kernel/bpf/verifier.c

+15 −0

Original line number	Diff line number	Diff line
		@@ -10620,11 +10620,26 @@ static int check_helper_call(struct bpf_verifier_env env, struct bpf_insn insn

		switch (func_id) {
		case BPF_FUNC_tail_call:
		if (env->cur_state->active_lock.ptr) {
		verbose(env, "tail_call cannot be used inside bpf_spin_lock-ed region\n");
		return -EINVAL;
		}

		err = check_reference_leak(env, false);
		if (err) {
		verbose(env, "tail_call would lead to reference leak\n");
		return err;
		}

		if (env->cur_state->active_rcu_lock) {
		verbose(env, "tail_call cannot be used inside bpf_rcu_read_lock-ed region\n");
		return -EINVAL;
		}

		if (env->cur_state->active_preempt_lock) {
		verbose(env, "tail_call cannot be used inside bpf_preempt_disable-ed region\n");
		return -EINVAL;
		}
		break;
		case BPF_FUNC_get_local_storage:
		/* check that flags argument in get_local_storage(map, flags) is 0,