bpf: Fix uninit read for helper mem args on partially spilled slots
Subsystems (4)
PATCH 1/2 bpf: Fix uninit read for helper mem args on partially spilled slots
check_stack_range_initialized() takes the spilled register path when bpf_is_spilled_reg(ss) holds, which, however, only looks at the last byte of the slot. Hence, a partially spilled scalar (on the lower part) bypasses the check and the following loads:
0: (b7) r1 = 1 ; R1=1 1: (63) *(u32 *)(r10 -8) = r1 ; R1=1 R10=fp0 fp-8=????1 2: (18) r1 = 0x0 ; R1=map_ptr(map=rb,ks=0,vs=0) 4: (bf) r2 = r10 ; R2=fp0 R10=fp0 5: (07) r2 += -8 ; R2=fp-8 6: (b7) r3 = 8 ; R3=8 7: (b7) r4 = 0 ; R4=0
8: (85) call bpf_ringbuf_output#130
...
When executed, it dumps the uninit four bytes:
RINGBUF: 01 00 00 00 ff ff ff ff
This is the same root cause as the non-fetch atomic case fixed in commit 5a84b4424db8 ("bpf: Fix uninit read for non-fetch atomics on partially spilled slots").
Fix by only taking the spilled register path for the bytes marked STACK_SPILL, so the rest of the slot goes through the usual checks.
--- kernel/bpf/verifier.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
kernel/bpf/verifier.c +6 -1
@@ -7484,7 +7484,12 @@ static int check_stack_range_initialized( goto mark; } -if (bpf_is_spilled_reg (ss) && +/* +* Only the bytes marked STACK_SPILL hold the spilled register. +* The rest of a narrowly spilled slot keeps its previous type +* and must be initialized on its own. +*/ +if (*stype ==STACK_SPILL && (ss->spilled_ptr.type ==SCALAR_VALUE || env->allow_ptr_leaks)) {if (clobber) {
Signature · 1 line
2.34.1
PATCH 2/2 selftests/bpf: Test helper read of a narrow stack spill
Spill a 32-bit scalar into an 8-byte stack slot, leaving the other half of the slot uninitialized. With CAP_BPF but without CAP_PERFMON the verifier rejects the helper's read.
--- .../selftests/bpf/progs/verifier_spill_fill.c | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+)
tools/testing/selftests/bpf/progs/verifier_spill_fill.c +24 -0
@@ -1363,6 +1363,30 @@ __naked void stack_noperfmon_reject_atomic_on_narrow_spill(void) ::: __clobber_all); } +SEC("socket") +__description("stack_noperfmon: reject helper read of narrow spill") +__success +__caps_unpriv(CAP_BPF) +__failure_unpriv __msg_unpriv("invalid read from stack R2 off -8+4 size 8") +__naked void stack_noperfmon_reject_helper_read_of_narrow_spill (void ) +{ + asmvolatile ( +"r1 = 1;" +"*(u32 *)(r10 - 8) = r1;" +"r1 = %[map_ringbuf] ll;" +"r2 = r10;" +"r2 += -8;" +"r3 = 8;" +"r4 = 0;" +"call %[bpf_ringbuf_output];" +"r0 = 0;" +"exit;" + : + : __imm(bpf_ringbuf_output), +__imm_addr (map_ringbuf) + : __clobber_all); +} + SEC("raw_tp") __success__naked void var_off_write_over_scalar_spill (void )
Signature · 1 line
2.34.1
This series was applied to bpf/bpf-next.git (master) by Kumar Kartikeya Dwivedi <[email protected]>:
Hello:
This series was applied to bpf/bpf-next.git (master) by Kumar Kartikeya Dwivedi <[email protected]>:
Quoted 12 lines · On Fri, 25 Sep 2026 10:28:13 +0200 you wrote:
check_stack_range_initialized()takes the spilled register path whenbpf_is_spilled_reg(ss)holds, which, however, only looks at the last byte of the slot. Hence, a partially spilled scalar (on the lower part) bypasses the check and the following loads:0: (b7) r1 = 1 ; R1=1 1: (63) *(u32 *)(r10 -8) = r1 ; R1=1 R10=fp0 fp-8=????1 2: (18) r1 = 0x0 ; R1=map_ptr(map=rb,ks=0,vs=0) 4: (bf) r2 = r10 ; R2=fp0 R10=fp0 5: (07) r2 += -8 ; R2=fp-8 6: (b7) r3 = 8 ; R3=8 7: (b7) r4 = 0 ; R4=0
Quoted 4 lines
8: (85) call bpf_ringbuf_output#130
...[...]
Here is the summary with links:
- [bpf-next,1/2] bpf: Fix uninit read for helper mem args on partially spilled slots
https://git.kernel.org/bpf/bpf-next/c/b3861495d2b2 - [bpf-next,2/2] selftests/bpf: Test helper read of a narrow stack spill https://git.kernel.org/bpf/bpf-next/c/7af653d4ebf8
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html