Commit 352d20d6 authored by Peng Sun's avatar Peng Sun Committed by Daniel Borkmann

bpf: drop refcount if bpf_map_new_fd() fails in map_create()

In bpf/syscall.c, map_create() first set map->usercnt to 1, a file
descriptor is supposed to return to userspace. When bpf_map_new_fd()
fails, drop the refcount.

Fixes: bd5f5f4e ("bpf: Add BPF_MAP_GET_FD_BY_ID")
Signed-off-by: default avatarPeng Sun <sironhide0null@gmail.com>
Acked-by: default avatarMartin KaFai Lau <kafai@fb.com>
Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent 781e6282
...@@ -559,12 +559,12 @@ static int map_create(union bpf_attr *attr) ...@@ -559,12 +559,12 @@ static int map_create(union bpf_attr *attr)
err = bpf_map_new_fd(map, f_flags); err = bpf_map_new_fd(map, f_flags);
if (err < 0) { if (err < 0) {
/* failed to allocate fd. /* failed to allocate fd.
* bpf_map_put() is needed because the above * bpf_map_put_with_uref() is needed because the above
* bpf_map_alloc_id() has published the map * bpf_map_alloc_id() has published the map
* to the userspace and the userspace may * to the userspace and the userspace may
* have refcnt-ed it through BPF_MAP_GET_FD_BY_ID. * have refcnt-ed it through BPF_MAP_GET_FD_BY_ID.
*/ */
bpf_map_put(map); bpf_map_put_with_uref(map);
return err; return err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment