OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fbc1449
)
bpf: fix link failure with NETFILTER=y INET=n
author
Florian Westphal
<fw@strlen.de>
Sat, 22 Apr 2023 07:35:44 +0000
(09:35 +0200)
committer
Alexei Starovoitov
<ast@kernel.org>
Sat, 22 Apr 2023 15:21:05 +0000
(08:21 -0700)
Explicitly check if NETFILTER_BPF_LINK is enabled, else configs
that have NETFILTER=y but CONFIG_INET=n fail to link:
> kernel/bpf/syscall.o: undefined reference to `netfilter_prog_ops'
> kernel/bpf/verifier.o: undefined reference to `netfilter_verifier_ops'
Fixes:
fd9c663b9ad6
("bpf: minimal support for programs hooked into netfilter framework")
Reported-by: kernel test robot <lkp@intel.com>
Link:
https://lore.kernel.org/oe-kbuild-all/202304220903.fRZTJtxe-lkp@intel.com/
Signed-off-by: Florian Westphal <fw@strlen.de>
Link:
https://lore.kernel.org/r/20230422073544.17634-1-fw@strlen.de
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
include/linux/bpf_types.h
patch
|
blob
|
history
diff --git
a/include/linux/bpf_types.h
b/include/linux/bpf_types.h
index
39a999a
..
fc0d6f3
100644
(file)
--- a/
include/linux/bpf_types.h
+++ b/
include/linux/bpf_types.h
@@
-79,7
+79,7
@@
BPF_PROG_TYPE(BPF_PROG_TYPE_LSM, lsm,
#endif
BPF_PROG_TYPE(BPF_PROG_TYPE_SYSCALL, bpf_syscall,
void *, void *)
-#ifdef CONFIG_NETFILTER
+#ifdef CONFIG_NETFILTER
_BPF_LINK
BPF_PROG_TYPE(BPF_PROG_TYPE_NETFILTER, netfilter,
struct bpf_nf_ctx, struct bpf_nf_ctx)
#endif