bpf: verifier: support BPF_LOAD_ACQ in insn_def_regno()
PATCH 1/1 bpf: verifier: support BPF_LOAD_ACQ in insn_def_regno()
insn_def_regno() currently returns -1 for a BPF_LOAD_ACQ which is incorrect as BPF_LOAD_ACQ loads a value from (src_reg + off) into the dst_reg.
This was uncovered by syzkaller while fuzzing on arm32 architecture where this function was being called by opt_subreg_zext_lo32_rnd_hi32() and the warning inside this function was triggered because the BPF_LOAD_ACQ instruction can read 32 bit values so it needs to be zero-extended on some archs (eg. arm32) but the destination register (to be zero-extended) returned by insn_def_regno() was invalid (-1).
--- kernel/bpf/verifier.c | 3 +++ 1 file changed, 3 insertions(+)
kernel/bpf/verifier.c +3 -0
@@ -3643,6 +3643,9 @@ static bool is_reg64(struct bpf_verifier_env *env, struct bpf_insn *insn,/* Return the regno defined by the insn, or -1. */ static int insn_def_regno (const struct bpf_insn *insn) { +if (is_atomic_load_insn (insn)) +return insn->dst_reg; +switch (BPF_CLASS (insn->code)) {case BPF_JMP :case BPF_JMP32 :
Signature · 1 line
2.47.1
Eduard Zingerman
maintainerOn 2025-05-21 11:39, Puranjay Mohan wrote:
[...]
kernel/bpf/verifier.c static bool is_reg64(struct bpf_verifier_env *env, struct bpf_insn *insn, · line 3651
Quoted 10 lines
kernel/bpf/verifier.c +3
-0@@ -3643,6 +3643,9 @@ static bool is_reg64(struct bpf_verifier_env *env, struct bpf_insn *insn,/* Return the regno defined by the insn, or -1. */ static int insn_def_regno (const struct bpf_insn *insn) { +if (is_atomic_load_insn (insn)) +return insn->dst_reg; +switch (BPF_CLASS (insn->code)) {case BPF_JMP :case BPF_JMP32 :
I'm confused, is_atomic_load_insn() is defined as:
return BPF_CLASS(insn->code) == BPF_STX &&
BPF_MODE(insn->code) == BPF_ATOMIC &&
insn->imm == BPF_LOAD_ACQ;And insn_def_regno() has the following case:
case BPF_STX:
if (BPF_MODE(insn->code) == BPF_ATOMIC ||
BPF_MODE(insn->code) == BPF_PROBE_ATOMIC) {
if (insn->imm == BPF_CMPXCHG)
return BPF_REG_0;
else if (insn->imm == BPF_LOAD_ACQ)
return insn->dst_reg;
else if (insn->imm & BPF_FETCH)
return insn->src_reg;
}
return -1;Why is it not triggering?
Also, can this be tested with a BPF_F_TEST_RND_HI32 flag? E.g. see verifier_scalar_ids.c:linked_regs_and_subreg_def() test case.
Quoted 35 lines · Eduard Zingerman
On 2025-05-21 11:39, Puranjay Mohan wrote:
[...]kernel/bpf/verifier.c static bool is_reg64(struct bpf_verifier_env *env, struct bpf_insn *insn, · line 3651
Quoted 10 lines
kernel/bpf/verifier.c +3
-0@@ -3643,6 +3643,9 @@ static bool is_reg64(struct bpf_verifier_env *env, struct bpf_insn *insn,/* Return the regno defined by the insn, or -1. */ static int insn_def_regno (const struct bpf_insn *insn) { +if (is_atomic_load_insn (insn)) +return insn->dst_reg; +switch (BPF_CLASS (insn->code)) {case BPF_JMP :case BPF_JMP32 :I'm confused,
is_atomic_load_insn()is defined as:return BPF_CLASS(insn->code) == BPF_STX && BPF_MODE(insn->code) == BPF_ATOMIC && insn->imm == BPF_LOAD_ACQ;And
insn_def_regno()has the following case:case BPF_STX: if (BPF_MODE(insn->code) == BPF_ATOMIC || BPF_MODE(insn->code) == BPF_PROBE_ATOMIC) { if (insn->imm == BPF_CMPXCHG) return BPF_REG_0; else if (insn->imm == BPF_LOAD_ACQ) return insn->dst_reg; else if (insn->imm & BPF_FETCH) return insn->src_reg; } return -1;
Quoted 4 lines
Why is it not triggering?
Also, can this be tested with a
BPF_F_TEST_RND_HI32flag? E.g. see verifier_scalar_ids.c:linked_regs_and_subreg_def() test case.
I suspect it was already fixed by commitfce7bd8e385a ("bpf/verifier: Handle BPF_LOAD_ACQ instructions in insn_def_regno()")
Eduard Zingerman
maintainerAlexei Starovoitov <[email protected]> writes:
[...]
Quoted 3 lines
I suspect it was already fixed by commit
fce7bd8e385a("bpf/verifier: HandleBPF_LOAD_ACQinstructions ininsn_def_regno()")
I see, series [1] is not a part of the tag [2] tested by syzbot, thank you.
[1] "bpf, riscv64: Support load-acquire and store-release instructions"
https://lore.kernel.org/all/[email protected]/
[2] 172a9d94339c ("Merge tag '6.15-rc6-smb3-client-fixes'")
Quoted 8 lines · Eduard Zingerman
Alexei Starovoitov <[email protected]> writes:
[...]
Quoted 3 lines
I suspect it was already fixed by commit
fce7bd8e385a("bpf/verifier: HandleBPF_LOAD_ACQinstructions ininsn_def_regno()")
Quoted 5 lines
I see, series [1] is not a part of the tag [2] tested by syzbot, thank you.
[1] "bpf, riscv64: Support load-acquire and store-release instructions"
https://lore.kernel.org/all/[email protected]/[2]
172a9d94339c("Merge tag '6.15-rc6-smb3-client-fixes'")
Yes, sorry for missing this. The fix is in bpf-next but syzkaller was testing mainline.
Thanks,
Puranjay
Quoted 21 lines · Alexei Starovoitov
Quoted 20 lines · Eduard Zingerman
I'm confused,
is_atomic_load_insn()is defined as:return BPF_CLASS(insn->code) == BPF_STX && BPF_MODE(insn->code) == BPF_ATOMIC && insn->imm == BPF_LOAD_ACQ;And
insn_def_regno()has the following case:case BPF_STX: if (BPF_MODE(insn->code) == BPF_ATOMIC || BPF_MODE(insn->code) == BPF_PROBE_ATOMIC) { if (insn->imm == BPF_CMPXCHG) return BPF_REG_0; else if (insn->imm == BPF_LOAD_ACQ) return insn->dst_reg; else if (insn->imm & BPF_FETCH) return insn->src_reg; } return -1;
Quoted 8 lines
Quoted 4 lines
Why is it not triggering?
Also, can this be tested with a
BPF_F_TEST_RND_HI32flag? E.g. see verifier_scalar_ids.c:linked_regs_and_subreg_def() test case.I suspect it was already fixed by commit
fce7bd8e385a("bpf/verifier: HandleBPF_LOAD_ACQinstructions ininsn_def_regno()")
Ah, right; I did it when adding support for riscv64 (which needs_zext). I targeted bpf-next because at that time only x86_64 and arm64 (both !needs_zext) supported BPF_LOAD_ACQ, and didn't realize this could affect arm32 (needs_zext).
It should've targeted bpf with a Fixes: tag instead. Sorry for any confusion.
Thanks,
Peilin Ye