]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
bpf: Acquire map uref in .init_seq_private for array map iterator
authorHou Tao <houtao1@huawei.com>
Wed, 10 Aug 2022 08:05:30 +0000 (16:05 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 Aug 2022 09:37:55 +0000 (11:37 +0200)
commit30d7198da84f8767c38bebf21c3b7eb2a87ff46a
tree925464761e88c6f90ab6e5f9019de8d948cf787d
parent76ffd2042438769298f34b76102b40dea89de616
bpf: Acquire map uref in .init_seq_private for array map iterator

commit f76fa6b338055054f80c72b29c97fb95c1becadc upstream.

bpf_iter_attach_map() acquires a map uref, and the uref may be released
before or in the middle of iterating map elements. For example, the uref
could be released in bpf_iter_detach_map() as part of
bpf_link_release(), or could be released in bpf_map_put_with_uref() as
part of bpf_map_release().

Alternative fix is acquiring an extra bpf_link reference just like
a pinned map iterator does, but it introduces unnecessary dependency
on bpf_link instead of bpf_map.

So choose another fix: acquiring an extra map uref in .init_seq_private
for array map iterator.

Fixes: d3cc2ab546ad ("bpf: Implement bpf iterator for array maps")
Signed-off-by: Hou Tao <houtao1@huawei.com>
Acked-by: Yonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/r/20220810080538.1845898-2-houtao@huaweicloud.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
kernel/bpf/arraymap.c