[PATCH] netfilter: add back NETFILTER_XTABLES dependencies

[PATCH] netfilter: add back NETFILTER_XTABLES dependencies

[Arnd Bergmann]

From: Arnd Bergmann <arnd@arndb.de>

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: 9fce66583f06 ("netfilter: Exclude LEGACY TABLES on PREEMPT_RT.")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 net/bridge/netfilter/Kconfig | 1 +
 net/ipv4/netfilter/Kconfig   | 3 +++
 net/ipv6/netfilter/Kconfig   | 1 +
 3 files changed, 5 insertions(+)

diff --git a/net/bridge/netfilter/Kconfig b/net/bridge/netfilter/Kconfig
index 60f28e4fb5c0..4fd5a6ea26b4 100644
--- a/net/bridge/netfilter/Kconfig
+++ b/net/bridge/netfilter/Kconfig
@@ -43,6 +43,7 @@ config NF_CONNTRACK_BRIDGE
 config BRIDGE_NF_EBTABLES_LEGACY
 	tristate "Legacy EBTABLES support"
 	depends on BRIDGE && NETFILTER_XTABLES_LEGACY
+	depends on NETFILTER_XTABLES
 	default	n
 	help
 	 Legacy ebtables packet/frame classifier.
diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig
index 2c438b140e88..7dc9772fe2d8 100644
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
@@ -14,6 +14,7 @@ config NF_DEFRAG_IPV4
 config IP_NF_IPTABLES_LEGACY
 	tristate "Legacy IP tables support"
 	depends on NETFILTER_XTABLES_LEGACY
+	depends on NETFILTER_XTABLES
 	default	m if NETFILTER_XTABLES_LEGACY
 	help
 	  iptables is a legacy packet classifier.
@@ -326,6 +327,7 @@ endif # IP_NF_IPTABLES
 config IP_NF_ARPTABLES
 	tristate "Legacy ARPTABLES support"
 	depends on NETFILTER_XTABLES_LEGACY
+	depends on NETFILTER_XTABLES
 	default	n
 	help
 	  arptables is a legacy packet classifier.
@@ -343,6 +345,7 @@ config IP_NF_ARPFILTER
 	select IP_NF_ARPTABLES
 	select NETFILTER_FAMILY_ARP
 	depends on NETFILTER_XTABLES_LEGACY
+	depends on NETFILTER_XTABLES
 	help
 	  ARP packet filtering defines a table `filter', which has a series of
 	  rules for simple ARP packet filtering at local input and
diff --git a/net/ipv6/netfilter/Kconfig b/net/ipv6/netfilter/Kconfig
index 276860f65baa..81daf82ddc2d 100644
--- a/net/ipv6/netfilter/Kconfig
+++ b/net/ipv6/netfilter/Kconfig
@@ -10,6 +10,7 @@ menu "IPv6: Netfilter Configuration"
 config IP6_NF_IPTABLES_LEGACY
 	tristate "Legacy IP6 tables support"
 	depends on INET && IPV6 && NETFILTER_XTABLES_LEGACY
+	depends on NETFILTER_XTABLES
 	default	m if NETFILTER_XTABLES_LEGACY
 	help
 	  ip6tables is a legacy packet classifier.
-- 
2.39.5

Re: [PATCH] netfilter: add back NETFILTER_XTABLES dependencies

[Florian Westphal]

Arnd Bergmann <arnd@kernel.org> wrote:
> 
> 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.

Thanks Arnd.  I thought we could just replace NETFILTER_XTABLES depends
with NETFILTER_XTABLES_LEGACY, but I missed the difference between
tristate and bool.

Acked-by: Florian Westphal <fw@strlen.de>

Re: [PATCH] netfilter: add back NETFILTER_XTABLES dependencies

[Breno Leitao]

On Wed, Jul 30, 2025 at 11:45:32PM +0200, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> 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: 9fce66583f06 ("netfilter: Exclude LEGACY TABLES on PREEMPT_RT.")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Tested-by: Breno Leitao <leitao@debian.org>