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

Commit 7e56fbd2 authored by Daniel Borkmann's avatar Daniel Borkmann Committed by David S. Miller
Browse files

bpf, x86_64/arm64: remove old ldimm64 artifacts from jits 



For both cases, the verifier is already rejecting such invalid
formed instructions. Thus, remove these artifacts from old times
and align it with ppc64, sparc64 and s390x JITs that don't have
them in the first place.

Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cd5487fb

arch/arm64/net/bpf_jit_comp.c

+0 −9
Original line number Diff line number Diff line
@@ -604,15 +604,6 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx) 
		const struct bpf_insn insn1 = insn[1];

		u64 imm64;



		if (insn1.code != 0 || insn1.src_reg != 0 ||

		    insn1.dst_reg != 0 || insn1.off != 0) {

			/* Note: verifier in BPF core must catch invalid

			 * instructions.

			 */

			pr_err_once("Invalid BPF_LD_IMM64 instruction\n");

			return -EINVAL;

		}



		imm64 = (u64)insn1.imm << 32 | (u32)imm;

		emit_a64_mov_i64(dst, imm64, ctx);

arch/x86/net/bpf_jit_comp.c

+0 −7
Original line number Diff line number Diff line
@@ -490,13 +490,6 @@ static int do_jit(struct bpf_prog *bpf_prog, int *addrs, u8 *image, 
			break;



		case BPF_LD | BPF_IMM | BPF_DW:

			if (insn[1].code != 0 || insn[1].src_reg != 0 ||

			    insn[1].dst_reg != 0 || insn[1].off != 0) {

				/* verifier must catch invalid insns */

				pr_err("invalid BPF_LD_IMM64 insn\n");

				return -EINVAL;

			}



			/* optimization: if imm64 is zero, use 'xor <dst>,<dst>'

			 * to save 7 bytes.

			 */