Commit b12f0310 authored by Kumar Kartikeya Dwivedi's avatar Kumar Kartikeya Dwivedi Committed by Andrii Nakryiko
Browse files

bpf: Fix bpf_check_mod_kfunc_call for built-in modules 



When module registering its set is built-in, THIS_MODULE will be NULL,
hence we cannot return early in case owner is NULL.

Fixes: 14f267d9 ("bpf: btf: Introduce helpers for dynamic BTF set registration")
Signed-off-by: default avatarKumar Kartikeya Dwivedi <memxor@gmail.com>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Acked-by: default avatarSong Liu <songliubraving@fb.com>
Link: https://lore.kernel.org/bpf/20211122144742.477787-3-memxor@gmail.com
parent d9847eb8

kernel/bpf/btf.c

+0 −2
Original line number Diff line number Diff line
@@ -6371,8 +6371,6 @@ bool bpf_check_mod_kfunc_call(struct kfunc_btf_id_list *klist, u32 kfunc_id, 
{

	struct kfunc_btf_id_set *s;



	if (!owner)

		return false;

	mutex_lock(&klist->mutex);

	list_for_each_entry(s, &klist->list, list) {

		if (s->owner == owner && btf_id_set_contains(s->set, kfunc_id)) {