summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorPeng Sun <sironhide0null@gmail.com>2019-02-26 22:15:37 +0800
committerDaniel Borkmann <daniel@iogearbox.net>2019-02-26 19:08:30 +0100
commit781e62823cb81b972dc8652c1827205cda2ac9ac (patch)
tree7f97f6e117edfd62175df6776a0c208c9325988d /kernel
parent3da1ed7ac398f34fff1694017a07054d69c5f5c5 (diff)
downloadblackbird-obmc-linux-781e62823cb81b972dc8652c1827205cda2ac9ac.tar.gz
blackbird-obmc-linux-781e62823cb81b972dc8652c1827205cda2ac9ac.zip
bpf: decrease usercnt if bpf_map_new_fd() fails in bpf_map_get_fd_by_id()
In bpf/syscall.c, bpf_map_get_fd_by_id() use bpf_map_inc_not_zero() to increase the refcount, both map->refcnt and map->usercnt. Then, if bpf_map_new_fd() fails, should handle map->usercnt too. Fixes: bd5f5f4ecb78 ("bpf: Add BPF_MAP_GET_FD_BY_ID") Signed-off-by: Peng Sun <sironhide0null@gmail.com> Acked-by: Martin KaFai Lau <kafai@fb.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/bpf/syscall.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
index 8577bb7f8be6..f98328abe8fa 100644
--- a/kernel/bpf/syscall.c
+++ b/kernel/bpf/syscall.c
@@ -1986,7 +1986,7 @@ static int bpf_map_get_fd_by_id(const union bpf_attr *attr)
fd = bpf_map_new_fd(map, f_flags);
if (fd < 0)
- bpf_map_put(map);
+ bpf_map_put_with_uref(map);
return fd;
}
OpenPOWER on IntegriCloud