diff options
| author |   Andrii Nakryiko <andrii@kernel.org> | 2020-11-10 20:06:45 -0800 |
|---|---|---|
| committer |   Alexei Starovoitov <ast@kernel.org> | 2020-11-10 20:15:07 -0800 |
| commit | 7112d127984bd7b0c8ded7973b358829f16735f5 (patch) | |
| tree | 425d9859fc965a8f49ae5e5a644f9f2216b1b6a3 /kernel | |
| parent | Merge branch 'Remove unused test_ipip.sh test and add missed' (diff) | |
| download | linux-dev-7112d127984bd7b0c8ded7973b358829f16735f5.tar.xz linux-dev-7112d127984bd7b0c8ded7973b358829f16735f5.zip | |
bpf: Compile out btf_parse_module() if module BTF is not enabled
Make sure btf_parse_module() is compiled out if module BTFs are not enabled.
Fixes: 36e68442d1af ("bpf: Load and verify kernel module BTFs")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20201111040645.903494-1-andrii@kernel.org
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/bpf/btf.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c index 0f1fd2669d69..6b2d508b33d4 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c @@ -4478,6 +4478,8 @@ errout: return ERR_PTR(err); } +#ifdef CONFIG_DEBUG_INFO_BTF_MODULES + static struct btf *btf_parse_module(const char *module_name, const void *data, unsigned int data_size) { struct btf_verifier_env *env = NULL; @@ -4547,6 +4549,8 @@ errout: return ERR_PTR(err); } +#endif /* CONFIG_DEBUG_INFO_BTF_MODULES */ + struct btf *bpf_prog_get_target_btf(const struct bpf_prog *prog) { struct bpf_prog *tgt_prog = prog->aux->dst_prog; |