[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20251106125255.1969938-12-hao.sun@inf.ethz.ch>
Date: Thu, 6 Nov 2025 13:52:49 +0100
From: Hao Sun <sunhao.th@...il.com>
To: bpf@...r.kernel.org
Cc: ast@...nel.org,
daniel@...earbox.net,
andrii@...nel.org,
eddyz87@...il.com,
john.fastabend@...il.com,
martin.lau@...ux.dev,
song@...nel.org,
yonghong.song@...ux.dev,
linux-kernel@...r.kernel.org,
sunhao.th@...il.com,
Hao Sun <hao.sun@....ethz.ch>
Subject: [PATCH RFC 11/17] bpf: Track stack spill/fill in bcf_track()
Track symbolic values across stack spills/fills.
- On spill (`save_register_state()`), if tracking and the source is
non-constant and the spill is narrower than a full register, derive the
appropriate-width for the spill slot using `bcf_mov()`.
- On data writes to stack slots (`check_stack_write_*`), invalidate any
previously spilled pointer symbolic value by setting `spilled_ptr.bcf_expr`
to -1 when the slot is clobbered.
- On loads that coerce value register sizes (`check_mem_access()`), if the
destination already has a symbolic expr, cast it to the loaded size via
`bcf_mov()`.
Signed-off-by: Hao Sun <hao.sun@....ethz.ch>
---
kernel/bpf/verifier.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c
index df6d16a1c6f6..3f2981db1d40 100644
--- a/kernel/bpf/verifier.c
+++ b/kernel/bpf/verifier.c
@@ -5286,6 +5286,10 @@ static void copy_register_state(struct bpf_reg_state *dst, const struct bpf_reg_
*dst = *src;
}
+static int bcf_mov(struct bpf_verifier_env *env, struct bpf_reg_state *dst_reg,
+ struct bpf_reg_state *src_reg, u32 sz, bool bit32,
+ bool sext);
+
static void save_register_state(struct bpf_verifier_env *env,
struct bpf_func_state *state,
int spi, struct bpf_reg_state *reg,
@@ -5295,6 +5299,11 @@ static void save_register_state(struct bpf_verifier_env *env,
copy_register_state(&state->stack[spi].spilled_ptr, reg);
+ if (env->bcf.tracking && !tnum_is_const(reg->var_off) &&
+ size != BPF_REG_SIZE)
+ bcf_mov(env, &state->stack[spi].spilled_ptr, reg, size * 8,
+ false, false);
+
for (i = BPF_REG_SIZE; i > BPF_REG_SIZE - size; i--)
state->stack[spi].slot_type[i - 1] = STACK_SPILL;
@@ -5437,6 +5446,7 @@ static int check_stack_write_fixed_off(struct bpf_verifier_env *env,
/* regular write of data into stack destroys any spilled ptr */
state->stack[spi].spilled_ptr.type = NOT_INIT;
+ state->stack[spi].spilled_ptr.bcf_expr = -1;
/* Mark slots as STACK_MISC if they belonged to spilled ptr/dynptr/iter. */
if (is_stack_slot_special(&state->stack[spi]))
for (i = 0; i < BPF_REG_SIZE; i++)
@@ -5566,6 +5576,7 @@ static int check_stack_write_var_off(struct bpf_verifier_env *env,
/* Erase all other spilled pointers. */
state->stack[spi].spilled_ptr.type = NOT_INIT;
+ state->stack[spi].spilled_ptr.bcf_expr = -1;
/* Update the slot type. */
new_type = STACK_MISC;
@@ -8025,6 +8036,11 @@ static int check_mem_access(struct bpf_verifier_env *env, int insn_idx, u32 regn
coerce_reg_to_size(®s[value_regno], size);
else
coerce_reg_to_size_sx(®s[value_regno], size);
+
+ if (env->bcf.tracking && regs[value_regno].bcf_expr >= 0)
+ err = bcf_mov(env, ®s[value_regno],
+ ®s[value_regno], size * 8, false,
+ is_ldsx);
}
return err;
}
--
2.34.1
Powered by blists - more mailing lists