projects
/
linux-2.6-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9600d62
)
bpf: Compile out btf_parse_module() if module BTF is not enabled
author
Andrii Nakryiko
<andrii@kernel.org>
Wed, 11 Nov 2020 04:06:45 +0000
(20:06 -0800)
committer
Alexei Starovoitov
<ast@kernel.org>
Wed, 11 Nov 2020 04:15:07 +0000
(20:15 -0800)
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
kernel/bpf/btf.c
patch
|
blob
|
blame
|
history
diff --git
a/kernel/bpf/btf.c
b/kernel/bpf/btf.c
index 0f1fd2669d6971215b03ce634d7a43f17fc37f30..6b2d508b33d47c3c3387382765e43b86f409b71f 100644
(file)
--- 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;