diff options
| author | Alexei Starovoitov <ast@fb.com> | 2016-04-12 10:26:19 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-05-18 18:35:00 -0700 |
| commit | 682c5a13beec6c33d8b65fa4ae612f1c74033d63 (patch) | |
| tree | 0a163bc5f7a32a2407fdee7ff6f1908810c9a3c3 | |
| parent | e4bb8baf1c4dabce8e704704c46701051988bd9d (diff) | |
| download | linux-stable-682c5a13beec6c33d8b65fa4ae612f1c74033d63.tar.gz linux-stable-682c5a13beec6c33d8b65fa4ae612f1c74033d63.tar.bz2 linux-stable-682c5a13beec6c33d8b65fa4ae612f1c74033d63.zip | |
bpf/verifier: reject invalid LD_ABS | BPF_DW instruction
[ Upstream commit d82bccc69041a51f7b7b9b4a36db0772f4cdba21 ]
verifier must check for reserved size bits in instruction opcode and
reject BPF_LD | BPF_ABS | BPF_DW and BPF_LD | BPF_IND | BPF_DW instructions,
otherwise interpreter will WARN_RATELIMIT on them during execution.
Fixes: ddd872bc3098 ("bpf: verifier: add checks for BPF_ABS | BPF_IND instructions")
Signed-off-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>
| -rw-r--r-- | kernel/bpf/verifier.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 2e7f7ab739e4..c21cb146086c 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -1348,6 +1348,7 @@ static int check_ld_abs(struct verifier_env *env, struct bpf_insn *insn) } if (insn->dst_reg != BPF_REG_0 || insn->off != 0 || + BPF_SIZE(insn->code) == BPF_DW || (mode == BPF_ABS && insn->src_reg != BPF_REG_0)) { verbose("BPF_LD_ABS uses reserved fields\n"); return -EINVAL; |