Commit bb2d267c authored Aug 12, 2019 by Ilya Leoshkevich Committed by Daniel Borkmann Aug 12, 2019

s390/bpf: fix lcgr instruction encoding



"masking, test in bounds 3" fails on s390, because
BPF_ALU64_IMM(BPF_NEG, BPF_REG_2, 0) ignores the top 32 bits of
BPF_REG_2. The reason is that JIT emits lcgfr instead of lcgr.
The associated comment indicates that the code was intended to
emit lcgr in the first place, it's just that the wrong opcode
was used.

Fix by using the correct opcode.

Fixes: 05462310 ("s390/bpf: Add s390x eBPF JIT compiler backend")
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Acked-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

parent 125b7e09

arch/s390/net/bpf_jit_comp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -863,7 +863,7 @@ static noinline int bpf_jit_insn(struct bpf_jit jit, struct bpf_prog fp, int i
		break;
		case BPF_ALU64 \| BPF_NEG: /* dst = -dst */
		/* lcgr %dst,%dst */
		EMIT4(0xb9130000, dst_reg, dst_reg);
		EMIT4(0xb9030000, dst_reg, dst_reg);
		break;
		/*
		* BPF_FROM_BE/LE

Admin message