Commit 944df7b4 authored Feb 26, 2019 by Peng Sun Committed by Greg Kroah-Hartman Dec 05, 2019

bpf: decrease usercnt if bpf_map_new_fd() fails in bpf_map_get_fd_by_id()



[ Upstream commit 781e62823cb81b972dc8652c1827205cda2ac9ac ]

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: bd5f5f4e ("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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent ddb2badb

kernel/bpf/syscall.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1887,7 +1887,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;
		}