archive/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-08-15 14:11:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

netfilter: add back NETFILTER_XTABLES dependencies

Browse source 
Some Kconfig symbols were changed to depend on the 'bool' symbol
NETFILTER_XTABLES_LEGACY, which means they can now be set to built-in
when the xtables code itself is in a loadable module:

x86_64-linux-ld: vmlinux.o: in function `arpt_unregister_table_pre_exit':
(.text+0x1831987): undefined reference to `xt_find_table'
x86_64-linux-ld: vmlinux.o: in function `get_info.constprop.0':
arp_tables.c:(.text+0x1831aab): undefined reference to `xt_request_find_table_lock'
x86_64-linux-ld: arp_tables.c:(.text+0x1831bea): undefined reference to `xt_table_unlock'
x86_64-linux-ld: vmlinux.o: in function `do_arpt_get_ctl':
arp_tables.c:(.text+0x183205d): undefined reference to `xt_find_table_lock'
x86_64-linux-ld: arp_tables.c:(.text+0x18320c1): undefined reference to `xt_table_unlock'
x86_64-linux-ld: arp_tables.c:(.text+0x183219a): undefined reference to `xt_recseq'

Change these to depend on both NETFILTER_XTABLES and
NETFILTER_XTABLES_LEGACY.

Fixes: 9fce66583f ("netfilter: Exclude LEGACY TABLES on PREEMPT_RT.")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Florian Westphal <fw@strlen.de>
Tested-by: Breno Leitao <leitao@debian.org>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Arnd Bergmann 2025-07-30 23:45:32 +02:00 • committed by Pablo Neira Ayuso
parent f752adfaf5
commit 25a8b88f00
3 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
net/bridge/netfilter/Kconfig
View file

@ -43,6 +43,7 @@ config NF_CONNTRACK_BRIDGE
config BRIDGE_NF_EBTABLES_LEGACY config BRIDGE_NF_EBTABLES_LEGACY
tristate "Legacy EBTABLES support" tristate "Legacy EBTABLES support"
depends on BRIDGE && NETFILTER_XTABLES_LEGACY depends on BRIDGE && NETFILTER_XTABLES_LEGACY
depends on NETFILTER_XTABLES
default n default n
help help
Legacy ebtables packet/frame classifier. Legacy ebtables packet/frame classifier.

3
net/ipv4/netfilter/Kconfig
View file

@ -14,6 +14,7 @@ config NF_DEFRAG_IPV4
config IP_NF_IPTABLES_LEGACY config IP_NF_IPTABLES_LEGACY
tristate "Legacy IP tables support" tristate "Legacy IP tables support"
depends on NETFILTER_XTABLES_LEGACY depends on NETFILTER_XTABLES_LEGACY
depends on NETFILTER_XTABLES
default m if NETFILTER_XTABLES_LEGACY default m if NETFILTER_XTABLES_LEGACY
help help
iptables is a legacy packet classifier. iptables is a legacy packet classifier.
@ -326,6 +327,7 @@ endif # IP_NF_IPTABLES
config IP_NF_ARPTABLES config IP_NF_ARPTABLES
tristate "Legacy ARPTABLES support" tristate "Legacy ARPTABLES support"
depends on NETFILTER_XTABLES_LEGACY depends on NETFILTER_XTABLES_LEGACY
depends on NETFILTER_XTABLES
default n default n
help help
arptables is a legacy packet classifier. arptables is a legacy packet classifier.
@ -343,6 +345,7 @@ config IP_NF_ARPFILTER
select IP_NF_ARPTABLES select IP_NF_ARPTABLES
select NETFILTER_FAMILY_ARP select NETFILTER_FAMILY_ARP
depends on NETFILTER_XTABLES_LEGACY depends on NETFILTER_XTABLES_LEGACY
depends on NETFILTER_XTABLES
help help
ARP packet filtering defines a table `filter', which has a series of ARP packet filtering defines a table `filter', which has a series of
rules for simple ARP packet filtering at local input and rules for simple ARP packet filtering at local input and

1
net/ipv6/netfilter/Kconfig
View file

@ -10,6 +10,7 @@ menu "IPv6: Netfilter Configuration"
config IP6_NF_IPTABLES_LEGACY config IP6_NF_IPTABLES_LEGACY
tristate "Legacy IP6 tables support" tristate "Legacy IP6 tables support"
depends on INET && IPV6 && NETFILTER_XTABLES_LEGACY depends on INET && IPV6 && NETFILTER_XTABLES_LEGACY
depends on NETFILTER_XTABLES
default m if NETFILTER_XTABLES_LEGACY default m if NETFILTER_XTABLES_LEGACY
help help
ip6tables is a legacy packet classifier. ip6tables is a legacy packet classifier.