bpf: Fix ld_{abs,ind} failure path analysis in subprogs

Usage of ld_{abs,ind} instructions got extended into subprogs some time
ago via commit 09b28d76eac4 ("bpf: Add abnormal return checks."). These
are only allowed in subprograms when the latter are BTF annotated and
have scalar return types.

The code generator in bpf_gen_ld_abs() has an abnormal exit path (r0=0 +
exit) from legacy cBPF times. While the enforcement is on scalar return
types, the verifier must also simulate the path of abnormal exit if the
packet data load via ld_{abs,ind} failed.

This is currently not the case. Fix it by having the verifier simulate
both success and failure paths, and extend it in similar ways as we do
for tail calls. The success path (r0=unknown, continue to next insn) is
pushed onto stack for later validation and the r0=0 and return to the
caller is done on the fall-through side.

Fixes: 09b28d76eac4 ("bpf: Add abnormal return checks.")
Reported-by: STAR Labs SG <info@starlabs.sg>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/r/20260408191242.526279-2-daniel@iogearbox.net
Signed-off-by: Alexei Starovoitov <ast@kernel.org>

diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index db009d509aded67867360ff0b98a59c3620db67a..fffb38a441e09bbc929c7e0c82e2cbb0ebe56964 100644 (file)
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -18357,6 +18357,23 @@ static int check_ld_abs(struct bpf_verifier_env *env, struct bpf_insn *insn)
        mark_reg_unknown(env, regs, BPF_REG_0);
        /* ld_abs load up to 32-bit skb data. */
        regs[BPF_REG_0].subreg_def = env->insn_idx + 1;
+       /*
+        * See bpf_gen_ld_abs() which emits a hidden BPF_EXIT with r0=0
+        * which must be explored by the verifier when in a subprog.
+        */
+       if (env->cur_state->curframe) {
+               struct bpf_verifier_state *branch;
+
+               mark_reg_scratched(env, BPF_REG_0);
+               branch = push_stack(env, env->insn_idx + 1, env->insn_idx, false);
+               if (IS_ERR(branch))
+                       return PTR_ERR(branch);
+               mark_reg_known_zero(env, regs, BPF_REG_0);
+               err = prepare_func_exit(env, &env->insn_idx);
+               if (err)
+                       return err;
+               env->insn_idx--;
+       }
        return 0;
 }
 
@@ -19276,7 +19293,12 @@ static int visit_gotox_insn(int t, struct bpf_verifier_env *env)
        return keep_exploring ? KEEP_EXPLORING : DONE_EXPLORING;
 }
 
-static int visit_tailcall_insn(struct bpf_verifier_env *env, int t)
+/*
+ * Instructions that can abnormally return from a subprog (tail_call
+ * upon success, ld_{abs,ind} upon load failure) have a hidden exit
+ * that the verifier must account for.
+ */
+static int visit_abnormal_return_insn(struct bpf_verifier_env *env, int t)
 {
        static struct bpf_subprog_info *subprog;
        struct bpf_iarray *jt;
@@ -19311,6 +19333,13 @@ static int visit_insn(int t, struct bpf_verifier_env *env)
        /* All non-branch instructions have a single fall-through edge. */
        if (BPF_CLASS(insn->code) != BPF_JMP &&
            BPF_CLASS(insn->code) != BPF_JMP32) {
+               if (BPF_CLASS(insn->code) == BPF_LD &&
+                   (BPF_MODE(insn->code) == BPF_ABS ||
+                    BPF_MODE(insn->code) == BPF_IND)) {
+                       ret = visit_abnormal_return_insn(env, t);
+                       if (ret)
+                               return ret;
+               }
                insn_sz = bpf_is_ldimm64(insn) ? 2 : 1;
                return push_insn(t, t + insn_sz, FALLTHROUGH, env);
        }
@@ -19356,7 +19385,7 @@ static int visit_insn(int t, struct bpf_verifier_env *env)
                        if (bpf_helper_changes_pkt_data(insn->imm))
                                mark_subprog_changes_pkt_data(env, t);
                        if (insn->imm == BPF_FUNC_tail_call) {
-                               ret = visit_tailcall_insn(env, t);
+                               ret = visit_abnormal_return_insn(env, t);
                                if (ret)
                                        return ret;
                        }