bpf: Fix bpf_check_mod_kfunc_call for built-in modules
authorKumar Kartikeya Dwivedi <memxor@gmail.com>
Mon, 22 Nov 2021 14:47:41 +0000 (20:17 +0530)
committerAndrii Nakryiko <andrii@kernel.org>
Thu, 2 Dec 2021 21:39:46 +0000 (13:39 -0800)
When module registering its set is built-in, THIS_MODULE will be NULL,
hence we cannot return early in case owner is NULL.

Fixes: 14f267d95fe4 ("bpf: btf: Introduce helpers for dynamic BTF set registration")
Signed-off-by: Kumar Kartikeya Dwivedi <memxor@gmail.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Acked-by: Song Liu <songliubraving@fb.com>
Link: https://lore.kernel.org/bpf/20211122144742.477787-3-memxor@gmail.com
kernel/bpf/btf.c

index ea3df9867cec872b30200237fd5002f546fef33d..9bdb03767db5701fad75a00831dba9ebb947cfb6 100644 (file)
@@ -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)) {