diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-05-05 10:12:37 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-05-05 10:12:37 +0200 |
| commit | 1a618c2cfe4c02190d8d1f9c5052f0defc58de20 (patch) | |
| tree | 170002288786f702e1d4ca638b53d1594a7caa16 /kernel/bpf | |
| parent | 03d85a63ee3e2d3a43460f936b86334b32f88c89 (diff) | |
| parent | 8482716b9d865db34c55d4bf2fed19498e7195b9 (diff) | |
| download | blackbird-obmc-linux-1a618c2cfe4c02190d8d1f9c5052f0defc58de20.tar.gz blackbird-obmc-linux-1a618c2cfe4c02190d8d1f9c5052f0defc58de20.zip | |
Merge branch 'perf/urgent' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/bpf')
| -rw-r--r-- | kernel/bpf/verifier.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 2e08f8e9b771..db2574e7b8b0 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -1374,6 +1374,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; @@ -2029,7 +2030,6 @@ static int replace_map_fd_with_map_ptr(struct verifier_env *env) if (IS_ERR(map)) { verbose("fd %d is not pointing to valid bpf_map\n", insn->imm); - fdput(f); return PTR_ERR(map); } |
