Skip to content

Commit 2ec54b2

Browse files
ecree-solarflaregregkh
authored andcommitted
bpf/verifier: reject BPF_ALU64|BPF_END
[ Upstream commit e67b8a685c7c984e834e3181ef4619cd7025a136 ] Neither ___bpf_prog_run nor the JITs accept it. Also adds a new test case. Fixes: 17a5267 ("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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent dee4506 commit 2ec54b2

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

kernel/bpf/verifier.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1033,7 +1033,8 @@ static int check_alu_op(struct verifier_env *env, struct bpf_insn *insn)
10331033
}
10341034
} else {
10351035
if (insn->src_reg != BPF_REG_0 || insn->off != 0 ||
1036-
(insn->imm != 16 && insn->imm != 32 && insn->imm != 64)) {
1036+
(insn->imm != 16 && insn->imm != 32 && insn->imm != 64) ||
1037+
BPF_CLASS(insn->code) == BPF_ALU64) {
10371038
verbose("BPF_END uses reserved fields\n");
10381039
return -EINVAL;
10391040
}

0 commit comments

Comments
 (0)