Commit 9d9d00ac authored by Kumar Kartikeya Dwivedi's avatar Kumar Kartikeya Dwivedi Committed by Alexei Starovoitov

bpf: Fix reference state management for synchronous callbacks

Currently, verifier verifies callback functions (sync and async) as if
they will be executed once, (i.e. it explores execution state as if the
function was being called once). The next insn to explore is set to
start of subprog and the exit from nested frame is handled using
curframe > 0 and prepare_func_exit. In case of async callback it uses a
customized variant of push_stack simulating a kind of branch to set up
custom state and execution context for the async callback.

While this approach is simple and works when callback really will be
executed only once, it is unsafe for all of our current helpers which
are for_each style, i.e. they execute the callback multiple times.

A callback releasing acquired references of the caller may do so
multiple times, but currently verifier sees it as one call inside the
frame, which then returns to caller. Hence, it thinks it released some
reference that the cb e.g. got access through callback_ctx (register
filled inside cb from spilled typed register on stack).

Similarly, it may see that an acquire call is unpaired inside the
callback, so the caller will copy the reference state of callback and
then will have to release the register with new ref_obj_ids. But again,
the callback may execute multiple times, but the verifier will only
account for acquired references for a single symbolic execution of the
callback, which will cause leaks.

Note that for async callback case, things are different. While currently
we have bpf_timer_set_callback which only executes it once, even for
multiple executions it would be safe, as reference state is NULL and
check_reference_leak would force program to release state before
BPF_EXIT. The state is also unaffected by analysis for the caller frame.
Hence async callback is safe.

Since we want the reference state to be accessible, e.g. for pointers
loaded from stack through callback_ctx's PTR_TO_STACK, we still have to
copy caller's reference_state to callback's bpf_func_state, but we
enforce that whatever references it adds to that reference_state has
been released before it hits BPF_EXIT. This requires introducing a new
callback_ref member in the reference state to distinguish between caller
vs callee references. Hence, check_reference_leak now errors out if it
sees we are in callback_fn and we have not released callback_ref refs.
Since there can be multiple nested callbacks, like frame 0 -> cb1 -> cb2
etc. we need to also distinguish between whether this particular ref
belongs to this callback frame or parent, and only error for our own, so
we store state->frameno (which is always non-zero for callbacks).

In short, callbacks can read parent reference_state, but cannot mutate
it, to be able to use pointers acquired by the caller. They must only
undo their changes (by releasing their own acquired_refs before
BPF_EXIT) on top of caller reference_state before returning (at which
point the caller and callback state will match anyway, so no need to
copy it back to caller).

Fixes: 69c087ba ("bpf: Add bpf_for_each_map_elem() helper")
Signed-off-by: default avatarKumar Kartikeya Dwivedi <memxor@gmail.com>
Link: https://lore.kernel.org/r/20220823013125.24938-1-memxor@gmail.comSigned-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 5679ff2f
...@@ -212,6 +212,17 @@ struct bpf_reference_state { ...@@ -212,6 +212,17 @@ struct bpf_reference_state {
* is used purely to inform the user of a reference leak. * is used purely to inform the user of a reference leak.
*/ */
int insn_idx; int insn_idx;
/* There can be a case like:
* main (frame 0)
* cb (frame 1)
* func (frame 3)
* cb (frame 4)
* Hence for frame 4, if callback_ref just stored boolean, it would be
* impossible to distinguish nested callback refs. Hence store the
* frameno and compare that to callback_ref in check_reference_leak when
* exiting a callback function.
*/
int callback_ref;
}; };
/* state of the program: /* state of the program:
......
...@@ -1092,6 +1092,7 @@ static int acquire_reference_state(struct bpf_verifier_env *env, int insn_idx) ...@@ -1092,6 +1092,7 @@ static int acquire_reference_state(struct bpf_verifier_env *env, int insn_idx)
id = ++env->id_gen; id = ++env->id_gen;
state->refs[new_ofs].id = id; state->refs[new_ofs].id = id;
state->refs[new_ofs].insn_idx = insn_idx; state->refs[new_ofs].insn_idx = insn_idx;
state->refs[new_ofs].callback_ref = state->in_callback_fn ? state->frameno : 0;
return id; return id;
} }
...@@ -1104,6 +1105,9 @@ static int release_reference_state(struct bpf_func_state *state, int ptr_id) ...@@ -1104,6 +1105,9 @@ static int release_reference_state(struct bpf_func_state *state, int ptr_id)
last_idx = state->acquired_refs - 1; last_idx = state->acquired_refs - 1;
for (i = 0; i < state->acquired_refs; i++) { for (i = 0; i < state->acquired_refs; i++) {
if (state->refs[i].id == ptr_id) { if (state->refs[i].id == ptr_id) {
/* Cannot release caller references in callbacks */
if (state->in_callback_fn && state->refs[i].callback_ref != state->frameno)
return -EINVAL;
if (last_idx && i != last_idx) if (last_idx && i != last_idx)
memcpy(&state->refs[i], &state->refs[last_idx], memcpy(&state->refs[i], &state->refs[last_idx],
sizeof(*state->refs)); sizeof(*state->refs));
...@@ -6915,10 +6919,17 @@ static int prepare_func_exit(struct bpf_verifier_env *env, int *insn_idx) ...@@ -6915,10 +6919,17 @@ static int prepare_func_exit(struct bpf_verifier_env *env, int *insn_idx)
caller->regs[BPF_REG_0] = *r0; caller->regs[BPF_REG_0] = *r0;
} }
/* Transfer references to the caller */ /* callback_fn frame should have released its own additions to parent's
err = copy_reference_state(caller, callee); * reference state at this point, or check_reference_leak would
if (err) * complain, hence it must be the same as the caller. There is no need
return err; * to copy it back.
*/
if (!callee->in_callback_fn) {
/* Transfer references to the caller */
err = copy_reference_state(caller, callee);
if (err)
return err;
}
*insn_idx = callee->callsite + 1; *insn_idx = callee->callsite + 1;
if (env->log.level & BPF_LOG_LEVEL) { if (env->log.level & BPF_LOG_LEVEL) {
...@@ -7042,13 +7053,20 @@ record_func_key(struct bpf_verifier_env *env, struct bpf_call_arg_meta *meta, ...@@ -7042,13 +7053,20 @@ record_func_key(struct bpf_verifier_env *env, struct bpf_call_arg_meta *meta,
static int check_reference_leak(struct bpf_verifier_env *env) static int check_reference_leak(struct bpf_verifier_env *env)
{ {
struct bpf_func_state *state = cur_func(env); struct bpf_func_state *state = cur_func(env);
bool refs_lingering = false;
int i; int i;
if (state->frameno && !state->in_callback_fn)
return 0;
for (i = 0; i < state->acquired_refs; i++) { for (i = 0; i < state->acquired_refs; i++) {
if (state->in_callback_fn && state->refs[i].callback_ref != state->frameno)
continue;
verbose(env, "Unreleased reference id=%d alloc_insn=%d\n", verbose(env, "Unreleased reference id=%d alloc_insn=%d\n",
state->refs[i].id, state->refs[i].insn_idx); state->refs[i].id, state->refs[i].insn_idx);
refs_lingering = true;
} }
return state->acquired_refs ? -EINVAL : 0; return refs_lingering ? -EINVAL : 0;
} }
static int check_bpf_snprintf_call(struct bpf_verifier_env *env, static int check_bpf_snprintf_call(struct bpf_verifier_env *env,
...@@ -12337,6 +12355,16 @@ static int do_check(struct bpf_verifier_env *env) ...@@ -12337,6 +12355,16 @@ static int do_check(struct bpf_verifier_env *env)
return -EINVAL; return -EINVAL;
} }
/* We must do check_reference_leak here before
* prepare_func_exit to handle the case when
* state->curframe > 0, it may be a callback
* function, for which reference_state must
* match caller reference state when it exits.
*/
err = check_reference_leak(env);
if (err)
return err;
if (state->curframe) { if (state->curframe) {
/* exit from nested function */ /* exit from nested function */
err = prepare_func_exit(env, &env->insn_idx); err = prepare_func_exit(env, &env->insn_idx);
...@@ -12346,10 +12374,6 @@ static int do_check(struct bpf_verifier_env *env) ...@@ -12346,10 +12374,6 @@ static int do_check(struct bpf_verifier_env *env)
continue; continue;
} }
err = check_reference_leak(env);
if (err)
return err;
err = check_return_code(env); err = check_return_code(env);
if (err) if (err)
return err; return err;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment