]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
bpf: Fix race between btf_put and btf_idr walk.
authorAlexei Starovoitov <ast@kernel.org>
Fri, 21 Apr 2023 01:49:01 +0000 (18:49 -0700)
committerDaniel Borkmann <daniel@iogearbox.net>
Fri, 21 Apr 2023 14:27:56 +0000 (16:27 +0200)
commitacf1c3d68e9a31f10d92bc67ad4673cdae5e8d92
tree63a126a226bb5d1f99550916f93f85a2029dacec
parent267a6e4e7870beb8896c192da175800e47c82407
bpf: Fix race between btf_put and btf_idr walk.

Florian and Eduard reported hard dead lock:
[   58.433327]  _raw_spin_lock_irqsave+0x40/0x50
[   58.433334]  btf_put+0x43/0x90
[   58.433338]  bpf_find_btf_id+0x157/0x240
[   58.433353]  btf_parse_fields+0x921/0x11c0

This happens since btf->refcount can be 1 at the time of btf_put() and
btf_put() will call btf_free_id() which will try to grab btf_idr_lock
and will dead lock.
Avoid the issue by doing btf_put() without locking.

Fixes: 3d78417b60fb ("bpf: Add bpf_btf_find_by_name_kind() helper.")
Fixes: 1e89106da253 ("bpf: Add bpf_core_add_cands() and wire it into bpf_core_apply_relo_insn().")
Reported-by: Florian Westphal <fw@strlen.de>
Reported-by: Eduard Zingerman <eddyz87@gmail.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Tested-by: Eduard Zingerman <eddyz87@gmail.com>
Link: https://lore.kernel.org/bpf/20230421014901.70908-1-alexei.starovoitov@gmail.com
kernel/bpf/btf.c