bpf/verifier: reject BPF_ALU64|BPF_END

Neither ___bpf_prog_run nor the JITs accept it.
Also adds a new test case.

Fixes: 17a5267067f3 ("bpf: verifier (add verifier core)")
Signed-off-by: Edward Cree <ecree@solarflare.com>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by Edward Cree and committed by David S. Miller e67b8a68 8c7c19a5

+18 -1
+2 -1
kernel/bpf/verifier.c
··· 2292 2292 } 2293 2293 } else { 2294 2294 if (insn->src_reg != BPF_REG_0 || insn->off != 0 || 2295 - (insn->imm != 16 && insn->imm != 32 && insn->imm != 64)) { 2295 + (insn->imm != 16 && insn->imm != 32 && insn->imm != 64) || 2296 + BPF_CLASS(insn->code) == BPF_ALU64) { 2296 2297 verbose("BPF_END uses reserved fields\n"); 2297 2298 return -EINVAL; 2298 2299 }
+16
tools/testing/selftests/bpf/test_verifier.c
··· 6629 6629 .result = REJECT, 6630 6630 .flags = F_NEEDS_EFFICIENT_UNALIGNED_ACCESS, 6631 6631 }, 6632 + { 6633 + "invalid 64-bit BPF_END", 6634 + .insns = { 6635 + BPF_MOV32_IMM(BPF_REG_0, 0), 6636 + { 6637 + .code = BPF_ALU64 | BPF_END | BPF_TO_LE, 6638 + .dst_reg = BPF_REG_0, 6639 + .src_reg = 0, 6640 + .off = 0, 6641 + .imm = 32, 6642 + }, 6643 + BPF_EXIT_INSN(), 6644 + }, 6645 + .errstr = "BPF_END uses reserved fields", 6646 + .result = REJECT, 6647 + }, 6632 6648 }; 6633 6649 6634 6650 static int probe_filter_length(const struct bpf_insn *fp)