Commit 34f05df3 authored by Geliang Tang's avatar Geliang Tang
Browse files

bpf, btf: Fix return value of register_btf_id_dtor_kfuncs 

mainline inclusion
from mainline-v6.9-rc1
commit b9a395f0f7af66fe8224450481b99d4f83b57207
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9VYQ9
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=b9a395f0f7af66fe8224450481b99d4f83b57207



--------------------------------

The same as __register_btf_kfunc_id_set(), to let the modules with
stripped btf section loaded, this patch changes the return value of
register_btf_id_dtor_kfuncs() too from -ENOENT to 0 when btf is NULL.

Signed-off-by: default avatarGeliang Tang <tanggeliang@kylinos.cn>
Link: https://lore.kernel.org/r/eab65586d7fb0e72f2707d3747c7d4a5d60c823f.1707373307.git.tanggeliang@kylinos.cn


Signed-off-by: default avatarMartin KaFai Lau <martin.lau@kernel.org>
Reviewed-by: default avatarJackie Liu <liuyun01@kylinos.cn>
Signed-off-by: default avatarGeliang Tang <tanggeliang@kylinos.cn>
parent 7f4b6a59

kernel/bpf/btf.c

+2 −4
Original line number Diff line number Diff line
@@ -8004,10 +8004,8 @@ int register_btf_id_dtor_kfuncs(const struct btf_id_dtor_kfunc *dtors, u32 add_c 
			pr_err("missing vmlinux BTF, cannot register dtor kfuncs\n");

			return -ENOENT;

		}

		if (owner && IS_ENABLED(CONFIG_DEBUG_INFO_BTF_MODULES)) {

			pr_err("missing module BTF, cannot register dtor kfuncs\n");

			return -ENOENT;

		}

		if (owner && IS_ENABLED(CONFIG_DEBUG_INFO_BTF_MODULES))

			pr_warn("missing module BTF, cannot register dtor kfuncs\n");

		return 0;

	}

	if (IS_ERR(btf))