diff options
author | Arnd Bergmann | 2019-03-13 22:15:59 +0100 |
---|---|---|
committer | Greg Kroah-Hartman | 2019-05-04 09:20:12 +0200 |
commit | 506375f509b848be301af24d1d1bee8a28c9a1b1 (patch) | |
tree | 450d8b07e39755d032e4175183983f1ee74e2f23 /net/netfilter | |
parent | netfilter: bridge: set skb transport_header before entering NF_INET_PRE_ROUTING (diff) | |
download | kernel-qcow2-linux-506375f509b848be301af24d1d1bee8a28c9a1b1.tar.gz kernel-qcow2-linux-506375f509b848be301af24d1d1bee8a28c9a1b1.tar.xz kernel-qcow2-linux-506375f509b848be301af24d1d1bee8a28c9a1b1.zip |
netfilter: fix NETFILTER_XT_TARGET_TEE dependencies
[ Upstream commit d1fa381033eb718df5c602f64b6e88676138dfc6 ]
With NETFILTER_XT_TARGET_TEE=y and IP6_NF_IPTABLES=m, we get a link
error when referencing the NF_DUP_IPV6 module:
net/netfilter/xt_TEE.o: In function `tee_tg6':
xt_TEE.c:(.text+0x14): undefined reference to `nf_dup_ipv6'
The problem here is the 'select NF_DUP_IPV6 if IP6_NF_IPTABLES'
that forces NF_DUP_IPV6 to be =m as well rather than setting it
to =y as was intended here. Adding a soft dependency on
IP6_NF_IPTABLES avoids that broken configuration.
Fixes: 5d400a4933e8 ("netfilter: Kconfig: Change select IPv6 dependencies")
Cc: Máté Eckl <ecklm94@gmail.com>
Cc: Taehee Yoo <ap420073@gmail.com>
Link: https://patchwork.ozlabs.org/patch/999498/
Link: https://lore.kernel.org/patchwork/patch/960062/
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin (Microsoft) <sashal@kernel.org>
Diffstat (limited to 'net/netfilter')
-rw-r--r-- | net/netfilter/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig index f61c306de1d0..e0fb56d67d42 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig @@ -1003,6 +1003,7 @@ config NETFILTER_XT_TARGET_TEE depends on NETFILTER_ADVANCED depends on IPV6 || IPV6=n depends on !NF_CONNTRACK || NF_CONNTRACK + depends on IP6_NF_IPTABLES || !IP6_NF_IPTABLES select NF_DUP_IPV4 select NF_DUP_IPV6 if IP6_NF_IPTABLES ---help--- |