diff options
| author | Alexei Starovoitov | 2016-04-28 03:56:20 +0200 |
|---|---|---|
| committer | David S. Miller | 2016-04-28 23:29:45 +0200 |
| commit | 92117d8443bc5afacc8d5ba82e541946310f106e (patch) | |
| tree | d0db595b54f82b59049d4b879561c2f97d25e18b /kernel/bpf/verifier.c | |
| parent | Merge branch 'cpsw-phy-handle-fixes' (diff) | |
| download | kernel-qcow2-linux-92117d8443bc5afacc8d5ba82e541946310f106e.tar.gz kernel-qcow2-linux-92117d8443bc5afacc8d5ba82e541946310f106e.tar.xz kernel-qcow2-linux-92117d8443bc5afacc8d5ba82e541946310f106e.zip | |
bpf: fix refcnt overflow
On a system with >32Gbyte of phyiscal memory and infinite RLIMIT_MEMLOCK,
the malicious application may overflow 32-bit bpf program refcnt.
It's also possible to overflow map refcnt on 1Tb system.
Impose 32k hard limit which means that the same bpf program or
map cannot be shared by more than 32k processes.
Fixes: 1be7f75d1668 ("bpf: enable non-root eBPF programs")
Reported-by: Jann Horn <jannh@google.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'kernel/bpf/verifier.c')
| -rw-r--r-- | kernel/bpf/verifier.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index db2574e7b8b0..89bcaa0966da 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@ -2049,15 +2049,18 @@ static int replace_map_fd_with_map_ptr(struct verifier_env *env) return -E2BIG; } - /* remember this map */ - env->used_maps[env->used_map_cnt++] = map; - /* hold the map. If the program is rejected by verifier, * the map will be released by release_maps() or it * will be used by the valid program until it's unloaded * and all maps are released in free_bpf_prog_info() */ - bpf_map_inc(map, false); + map = bpf_map_inc(map, false); + if (IS_ERR(map)) { + fdput(f); + return PTR_ERR(map); + } + env->used_maps[env->used_map_cnt++] = map; + fdput(f); next_insn: insn++; |