diff options
| author | Edward Cree <ecree@solarflare.com> | 2017-09-15 14:37:38 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-21 17:07:24 +0200 |
| commit | 63692f8b33bd8167169e600350b1d5a3102a71ad (patch) | |
| tree | 83fb8db9577ae459a3b0882fd6ed3b6c00bc4b9a /kernel | |
| parent | db27397942aa3f3c7b02a28d52878468923834bd (diff) | |
| download | linux-stable-63692f8b33bd8167169e600350b1d5a3102a71ad.tar.gz linux-stable-63692f8b33bd8167169e600350b1d5a3102a71ad.tar.bz2 linux-stable-63692f8b33bd8167169e600350b1d5a3102a71ad.zip | |
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: 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/bpf/verifier.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index eac45b688c08..76cd19dcb7f0 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -932,7 +932,8 @@ static int check_alu_op(struct reg_state *regs, struct bpf_insn *insn) } } else { if (insn->src_reg != BPF_REG_0 || insn->off != 0 || - (insn->imm != 16 && insn->imm != 32 && insn->imm != 64)) { + (insn->imm != 16 && insn->imm != 32 && insn->imm != 64) || + BPF_CLASS(insn->code) == BPF_ALU64) { verbose("BPF_END uses reserved fields\n"); return -EINVAL; } |