Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1cad781e authored by Naveen N. Rao's avatar Naveen N. Rao Committed by Greg Kroah-Hartman
Browse files

powerpc/bpf: Fix BPF_MOD when imm == 1 



commit 8bbc9d822421d9ac8ff9ed26a3713c9afc69d6c8 upstream.

Only ignore the operation if dividing by 1.

Fixes: 156d0e29 ("powerpc/ebpf/jit: Implement JIT compiler for extended BPF")
Signed-off-by: default avatarNaveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Tested-by: default avatarJohan Almbladh <johan.almbladh@anyfinetworks.com>
Reviewed-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Acked-by: default avatarSong Liu <songliubraving@fb.com>
Acked-by: default avatarJohan Almbladh <johan.almbladh@anyfinetworks.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/c674ca18c3046885602caebb326213731c675d06.1633464148.git.naveen.n.rao@linux.vnet.ibm.com


[cascardo: use PPC_LI instead of EMIT(PPC_RAW_LI)]
Signed-off-by: default avatarThadeu Lima de Souza Cascardo <cascardo@canonical.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ca10ddbb

arch/powerpc/net/bpf_jit_comp64.c

+8 −2
Original line number Diff line number Diff line
@@ -408,8 +408,14 @@ static int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, 
		case BPF_ALU64 | BPF_DIV | BPF_K: /* dst /= imm */

			if (imm == 0)

				return -EINVAL;

			else if (imm == 1)

			if (imm == 1) {

				if (BPF_OP(code) == BPF_DIV) {

					goto bpf_alu32_trunc;

				} else {

					PPC_LI(dst_reg, 0);

					break;

				}

			}



			PPC_LI32(b2p[TMP_REG_1], imm);

			switch (BPF_CLASS(code)) {