Skip to content

Commit 5855c4c

Browse files
rnavmpe
authored andcommitted
powerpc/bpf: Fix BPF_SUB when imm == 0x80000000
We aren't handling subtraction involving an immediate value of 0x80000000 properly. Fix the same. Fixes: 156d0e2 ("powerpc/ebpf/jit: Implement JIT compiler for extended BPF") Signed-off-by: Naveen N. Rao <[email protected]> Reviewed-by: Christophe Leroy <[email protected]> [mpe: Fold in fix from Naveen to use imm <= 32768] Signed-off-by: Michael Ellerman <[email protected]> Link: https://lore.kernel.org/r/fc4b1276eb10761fd7ce0814c8dd089da2815251.1633464148.git.naveen.n.rao@linux.vnet.ibm.com
1 parent 8bbc9d8 commit 5855c4c

File tree

1 file changed

+17
-10
lines changed

1 file changed

+17
-10
lines changed

arch/powerpc/net/bpf_jit_comp64.c

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -330,18 +330,25 @@ int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, struct codegen_context *
330330
EMIT(PPC_RAW_SUB(dst_reg, dst_reg, src_reg));
331331
goto bpf_alu32_trunc;
332332
case BPF_ALU | BPF_ADD | BPF_K: /* (u32) dst += (u32) imm */
333-
case BPF_ALU | BPF_SUB | BPF_K: /* (u32) dst -= (u32) imm */
334333
case BPF_ALU64 | BPF_ADD | BPF_K: /* dst += imm */
334+
if (!imm) {
335+
goto bpf_alu32_trunc;
336+
} else if (imm >= -32768 && imm < 32768) {
337+
EMIT(PPC_RAW_ADDI(dst_reg, dst_reg, IMM_L(imm)));
338+
} else {
339+
PPC_LI32(b2p[TMP_REG_1], imm);
340+
EMIT(PPC_RAW_ADD(dst_reg, dst_reg, b2p[TMP_REG_1]));
341+
}
342+
goto bpf_alu32_trunc;
343+
case BPF_ALU | BPF_SUB | BPF_K: /* (u32) dst -= (u32) imm */
335344
case BPF_ALU64 | BPF_SUB | BPF_K: /* dst -= imm */
336-
if (BPF_OP(code) == BPF_SUB)
337-
imm = -imm;
338-
if (imm) {
339-
if (imm >= -32768 && imm < 32768)
340-
EMIT(PPC_RAW_ADDI(dst_reg, dst_reg, IMM_L(imm)));
341-
else {
342-
PPC_LI32(b2p[TMP_REG_1], imm);
343-
EMIT(PPC_RAW_ADD(dst_reg, dst_reg, b2p[TMP_REG_1]));
344-
}
345+
if (!imm) {
346+
goto bpf_alu32_trunc;
347+
} else if (imm > -32768 && imm <= 32768) {
348+
EMIT(PPC_RAW_ADDI(dst_reg, dst_reg, IMM_L(-imm)));
349+
} else {
350+
PPC_LI32(b2p[TMP_REG_1], imm);
351+
EMIT(PPC_RAW_SUB(dst_reg, dst_reg, b2p[TMP_REG_1]));
345352
}
346353
goto bpf_alu32_trunc;
347354
case BPF_ALU | BPF_MUL | BPF_X: /* (u32) dst *= (u32) src */

0 commit comments

Comments
 (0)