Skip to content

Commit 60f3caf

Browse files
chenhengqichenhuacai
authored andcommitted
LoongArch: BPF: Don't override subprog's return value
The verifier test `calls: div by 0 in subprog` triggers a panic at the ld.bu instruction. The ld.bu insn is trying to load byte from memory address returned by the subprog. The subprog actually set the correct address at the a5 register (dedicated register for BPF return values). But at commit 73c359d ("LoongArch: BPF: Sign-extend return values") we also sign extended a5 to the a0 register (return value in LoongArch). For function call insn, we later propagate the a0 register back to a5 register. This is right for native calls but wrong for bpf2bpf calls which expect zero-extended return value in a5 register. So only move a0 to a5 for native calls (i.e. non-BPF_PSEUDO_CALL). Cc: stable@vger.kernel.org Fixes: 73c359d ("LoongArch: BPF: Sign-extend return values") Signed-off-by: Hengqi Chen <hengqi.chen@gmail.com> Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
1 parent 52266f1 commit 60f3caf

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

arch/loongarch/net/bpf_jit.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -907,7 +907,10 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx, bool ext
907907

908908
move_addr(ctx, t1, func_addr);
909909
emit_insn(ctx, jirl, LOONGARCH_GPR_RA, t1, 0);
910-
move_reg(ctx, regmap[BPF_REG_0], LOONGARCH_GPR_A0);
910+
911+
if (insn->src_reg != BPF_PSEUDO_CALL)
912+
move_reg(ctx, regmap[BPF_REG_0], LOONGARCH_GPR_A0);
913+
911914
break;
912915

913916
/* tail call */

0 commit comments

Comments
 (0)