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: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/arch/arm64/net/bpf_jit_comp.c b/arch/arm64/net/bpf_jit_comp.c
index a785554916c06caa412564338f7728d655a899eb..304736870dca0cbb74206f9230eb4dbb4cd36713 100644 (file)
--- a/arch/arm64/net/bpf_jit_comp.c
+++ b/arch/arm64/net/bpf_jit_comp.c
@@ -604,15 +604,6 @@ emit_cond_jmp:
                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);
 

diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
index 32322ce9b405450c1187a8e9403658617293e39e..14f840df1d9505bd43859537b0d88d66206a1608 100644 (file)
--- a/arch/x86/net/bpf_jit_comp.c
+++ b/arch/x86/net/bpf_jit_comp.c
@@ -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.
                         */