bpf: Fix incorrect immediate spill
Subsystems (5)
v3 cover bpf: Fix incorrect immediate spill
Immediate is incorrectly cast to u32 before being spilled, losing sign information. The range information is incorrect after load again. Fix immediate spill by remove the cast. The second patch add a test case for this.
---
Changes in v3:
- Change the expected log to fix the test case
- Link to v2: https://lore.kernel.org/r/[email protected]
Changes in v2:
- Add fix and cc tags.
- Link to v1: https://lore.kernel.org/r/[email protected]
---
Hao Sun (2):
bpf: Fix check_stack_write_fixed_off() to correctly spill imm selftests/bpf: Add test for immediate spilled to stack
kernel/bpf/verifier.c | 2 +- tools/testing/selftests/bpf/verifier/bpf_st_mem.c | 32 +++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-)
---
base-commit: f2fbb908112311423b09cd0d2b4978f174b99585
change-id: 20231026-fix-check-stack-write-c40996694dfa
Best regards,
Signature · 1 line
Hao Sun <[email protected]>
PATCH v3 1/2 bpf: Fix check_stack_write_fixed_off() to correctly spill imm
In check_stack_write_fixed_off(), imm value is cast to u32 before being spilled to the stack. Therefore, the sign information is lost, and the range information is incorrect when load from the stack again.
For the following prog:
0: r2 = r10
1: *(u64*)(r2 -40) = -44
2: r0 = *(u64*)(r2 - 40)
3: if r0 s<= 0xa goto +2
4: r0 = 1
5: exit
6: r0 = 0
7: exit
The verifier gives:
func#0 @0
0: R1=ctx(off=0,imm=0) R10=fp0
0: (bf) r2 = r10 ; R2_w=fp0 R10=fp0 1: (7a) *(u64 *)(r2 -40) = -44 ; R2_w=fp0 fp-40_w=4294967252 2: (79) r0 = *(u64 *)(r2 -40) ; R0_w=4294967252 R2_w=fp0
fp-40_w=4294967252
3: (c5) if r0 s< 0xa goto pc+2mark_precise: frame0: last_idx 3 first_idx 0 subseq_idx -1mark_precise: frame0: regs=r0 stack= before 2: (79) r0 = *(u64 *)(r2 -40) 3: R0_w=4294967252
4: (b7) r0 = 1 ; R0_w=1
5: (95) exit
verification time 7971 usec
stack depth 40
processed 6 insns (limit 1000000) max_states_per_insn 0 total_states 0 peak_states 0 mark_read 0
So remove the incorrect cast, since imm field is declared as s32, and __mark_reg_known() takes u64, so imm would be correctly sign extended by compiler.
--- kernel/bpf/verifier.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/bpf/verifier.c +1 -1
@@ -4674,7 +4674,7 @@ static int check_stack_write_fixed_off(struct bpf_verifier_env *env, insn->imm != 0 && env->bpf_capable) {struct bpf_reg_state fake_reg = {}; -__mark_reg_known (&fake_reg, (u32 )insn->imm); +__mark_reg_known (&fake_reg, insn->imm); fake_reg.type =SCALAR_VALUE ;save_register_state (state, spi, &fake_reg, size); } else if (reg && is_spillable_regtype(reg->type)) {
Signature · 1 line
2.34.1
PATCH v3 2/2 selftests/bpf: Add test for immediate spilled to stack
In reply to Hao SunAdd a test to check if the verifier correctly reason about the sign of an immediate spilled to stack by BPF_ST instruction.
--- tools/testing/selftests/bpf/verifier/bpf_st_mem.c | 32 +++++++++++++++++++++++ 1 file changed, 32 insertions(+)
tools/testing/selftests/bpf/verifier/bpf_st_mem.c +32 -0
@@ -65,3 +65,35 @@ .expected_attach_type = BPF_SK_LOOKUP, .runs = -1, }, +{ + "BPF_ST_MEM stack imm sign", +/* Check if verifier correctly reasons about sign of an +* immediate spilled to stack by BPF_ST instruction. +* +* fp[-8] = -44; +* r0 = fp[-8]; +* if r0 s< 0 goto ret0; +* r0 = -1; +* exit; +* ret0: +* r0 = 0; +* exit; +*/ + .insns = { +BPF_ST_MEM (BPF_DW ,BPF_REG_10 ,-8 ,-44 ), +BPF_LDX_MEM (BPF_DW ,BPF_REG_0 ,BPF_REG_10 ,-8 ), +BPF_JMP_IMM (BPF_JSLT ,BPF_REG_0 ,0 ,2 ), +BPF_MOV64_IMM (BPF_REG_0 ,-1 ), +BPF_EXIT_INSN (), +BPF_MOV64_IMM (BPF_REG_0 ,0 ), + BPF_EXIT_INSN(), + }, +/* Use prog type that requires return value in range [0, 1] */ + .prog_type =BPF_PROG_TYPE_SK_LOOKUP , + .expected_attach_type = BPF_SK_LOOKUP, + .result = VERBOSE_ACCEPT, + .runs = -1, + .errstr = "0: (7a) *(u64 *)(r10 -8) = -44 ; R10=fp0 fp-8_w=-44\ +2: (c5) if r0 s< 0x0 goto pc+2\ + R0_w=-44", +},
Signature · 1 line
2.34.1
This series was applied to bpf/bpf.git (master) by Alexei Starovoitov <[email protected]>:
Hello:
This series was applied to bpf/bpf.git (master)
by Alexei Starovoitov <[email protected]>:
Quoted 8 lines · On Wed, 01 Nov 2023 13:33:50 +0100 you wrote:
Immediate is incorrectly cast to u32 before being spilled, losing sign information. The range information is incorrect after load again. Fix immediate spill by remove the cast. The second patch add a test case for this.
Signed-off-by Hao Sun <[email protected]>[...]
Here is the summary with links:
- [bpf,v3,1/2] bpf: Fix check_stack_write_fixed_off() to correctly spill imm
https://git.kernel.org/bpf/bpf/c/811c363645b3 - [bpf,v3,2/2] selftests/bpf: Add test for immediate spilled to stack https://git.kernel.org/bpf/bpf/c/85eb035e6cfd
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html