netfilter: nf_tables: Support auto-loading for inet nat
Subsystems (4)
Pablo Neira Ayuso
maintainerPATCH 10/14 netfilter: nf_tables: Support auto-loading for inet nat
From: Phil Sutter <[email protected]>
Trying to create an inet family nat chain would not cause nft_chain_nat.ko module to auto-load due to missing module alias. Add a proper one with hard-coded family value 1 for the pseudo-family NFPROTO_INET.
--- net/netfilter/nft_chain_nat.c | 3 +++ 1 file changed, 3 insertions(+)
net/netfilter/nft_chain_nat.c +3 -0
@@ -142,3 +142,6 @@ MODULE_ALIAS_NFT_CHAIN(AF_INET, "nat");#ifdef CONFIG_NF_TABLES_IPV6 MODULE_ALIAS_NFT_CHAIN (AF_INET6 ,"nat" );#endif +#ifdef CONFIG_NF_TABLES_INET +MODULE_ALIAS_NFT_CHAIN (1 ,"nat" );/* NFPROTO_INET */ +#endif
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 11/14 netfilter: synproxy: fix rst sequence number mismatch
From: Fernando Fernandez Mancera <[email protected]>
14:51:00.024418 IP 192.168.122.1.41462 > netfilter.90: Flags [S], seq 4023580551,
14:51:00.024454 IP netfilter.90 > 192.168.122.1.41462: Flags [S.], seq 727560212, ack 4023580552,
14:51:00.024524 IP 192.168.122.1.41462 > netfilter.90: Flags [.], ack 1,
Note: here, synproxy will send a SYN to the real server, as the 3whs was completed sucessfully. Instead of a syn/ack that we can intercept, we instead received a reset packet from the real backend, that we forward to the original client. However, we don't use the correct sequence number, so the reset is not effective in closing the connection coming from the client.
14:51:00.024550 IP netfilter.90 > 192.168.122.1.41462: Flags [R.], seq 3567407084,
14:51:00.231196 IP 192.168.122.1.41462 > netfilter.90: Flags [.], ack 1, 14:51:00.647911 IP 192.168.122.1.41462 > netfilter.90: Flags [.], ack 1, 14:51:01.474395 IP 192.168.122.1.41462 > netfilter.90: Flags [.], ack 1,
--- net/netfilter/nf_synproxy_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/netfilter/nf_synproxy_core.c +2 -2
@@ -687,7 +687,7 @@ ipv4_synproxy_hook(void *priv, struct sk_buff *skb, state = &ct->proto.tcp;switch (state->state) {case TCP_CONNTRACK_CLOSE : -if (th->rst && !test_bit (IPS_SEEN_REPLY_BIT , &ct->status)) { +if (th->rst &&CTINFO2DIR (ctinfo) !=IP_CT_DIR_ORIGINAL ) {nf_ct_seqadj_init (ct, ctinfo, synproxy->isn -ntohl (th->seq) +1 );break ;
@@ -1111,7 +1111,7 @@ ipv6_synproxy_hook(void *priv, struct sk_buff *skb, state = &ct->proto.tcp;switch (state->state) {case TCP_CONNTRACK_CLOSE : -if (th->rst && !test_bit (IPS_SEEN_REPLY_BIT , &ct->status)) { +if (th->rst &&CTINFO2DIR (ctinfo) !=IP_CT_DIR_ORIGINAL ) {nf_ct_seqadj_init (ct, ctinfo, synproxy->isn -ntohl (th->seq) +1 );break ;
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 12/14 netfilter: nft_meta: skip EAGAIN if nft_meta_bridge is not a module
In reply to Pablo Neira AyusoIf it is a module, request this module. Otherwise, if it is compiled built-in or not selected, skip this.
--- net/netfilter/nft_meta.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/netfilter/nft_meta.c +1 -1
@@ -546,7 +546,7 @@ nft_meta_select_ops(const struct nft_ctx *ctx,if (tb[NFTA_META_DREG ] && tb[NFTA_META_SREG ])return ERR_PTR (-EINVAL ); -#ifdef CONFIG_NF_TABLES_BRIDGE +#if defined(CONFIG_NF_TABLES_BRIDGE ) &&IS_MODULE (CONFIG_NFT_BRIDGE_META )if (ctx->family ==NFPROTO_BRIDGE )return ERR_PTR (-EAGAIN );#endif
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 13/14 netfilter: bridge: NF_CONNTRACK_BRIDGE does not depend on NF_TABLES_BRIDGE
In reply to Pablo Neira AyusoPlace NF_CONNTRACK_BRIDGE away from the NF_TABLES_BRIDGE dependency.
--- net/bridge/netfilter/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/bridge/netfilter/Kconfig +2 -2
@@ -25,6 +25,8 @@ config NF_LOG_BRIDGE tristate "Bridge packet logging" select NF_LOG_COMMON +endif # NF_TABLES_BRIDGE + config NF_CONNTRACK_BRIDGE tristate "IPv4/IPV6 bridge connection tracking support" depends on NF_CONNTRACK
@@ -39,8 +41,6 @@ config NF_CONNTRACK_BRIDGE To compile it as a module, choose M here. If unsure, say N. -endif # NF_TABLES_BRIDGE - menuconfig BRIDGE_NF_EBTABLES tristate "Ethernet Bridge tables (ebtables) support" depends on BRIDGE && NETFILTER && NETFILTER_XTABLES
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 14/14 netfilter: bridge: make NF_TABLES_BRIDGE tristate
In reply to Pablo Neira AyusoFrom: Arnd Bergmann <[email protected]>
The new nft_meta_bridge code fails to link as built-in when NF_TABLES is a loadable module.
net/bridge/netfilter/nft_meta_bridge.o: In function `nft_meta_bridge_get_eval':
nft_meta_bridge.c:(.text+0x1e8): undefined reference to nft_meta_get_eval' net/bridge/netfilter/nft_meta_bridge.o: In function nft_meta_bridge_get_init':
nft_meta_bridge.c:(.text+0x468): undefined reference to nft_meta_get_init' nft_meta_bridge.c:(.text+0x49c): undefined reference to nft_parse_register' nft_meta_bridge.c:(.text+0x4cc): undefined reference to nft_validate_register_store' net/bridge/netfilter/nft_meta_bridge.o: In function nft_meta_bridge_module_exit':
nft_meta_bridge.c:(.exit.text+0x14): undefined reference to nft_unregister_expr' net/bridge/netfilter/nft_meta_bridge.o: In function nft_meta_bridge_module_init':
nft_meta_bridge.c:(.init.text+0x14): undefined reference to nft_register_expr' net/bridge/netfilter/nft_meta_bridge.o:(.rodata+0x60): undefined reference to nft_meta_get_dump' net/bridge/netfilter/nft_meta_bridge.o:(.rodata+0x88): undefined reference to `nft_meta_set_eval'
This can happen because the NF_TABLES_BRIDGE dependency itself is just a 'bool'. Make the symbol a 'tristate' instead so Kconfig can propagate the dependencies correctly.
--- net/bridge/netfilter/Kconfig | 2 +- net/netfilter/nft_chain_filter.c | 2 +- net/netfilter/nft_meta.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
net/bridge/netfilter/Kconfig +1 -1
@@ -6,7 +6,7 @@ menuconfig NF_TABLES_BRIDGE depends on BRIDGE && NETFILTER && NF_TABLES select NETFILTER_FAMILY_BRIDGE - bool "Ethernet Bridge nf_tables support" + tristate "Ethernet Bridge nf_tables support" if NF_TABLES_BRIDGE
net/netfilter/nft_chain_filter.c +1 -1
@@ -193,7 +193,7 @@ static inline void nft_chain_filter_inet_init(void) {}static inline void nft_chain_filter_inet_fini (void ) {}#endif /* CONFIG_NF_TABLES_IPV6 */ -#ifdef CONFIG_NF_TABLES_BRIDGE +#if IS_ENABLED (CONFIG_NF_TABLES_BRIDGE ) static unsigned int nft_do_chain_bridge(void *priv, struct sk_buff *skb,
net/netfilter/nft_meta.c +1 -1
@@ -546,7 +546,7 @@ nft_meta_select_ops(const struct nft_ctx *ctx,if (tb[NFTA_META_DREG ] && tb[NFTA_META_SREG ])return ERR_PTR (-EINVAL ); -#if defined(CONFIG_NF_TABLES_BRIDGE ) &&IS_MODULE (CONFIG_NFT_BRIDGE_META ) +#if IS_ENABLED (CONFIG_NF_TABLES_BRIDGE ) &&IS_MODULE (CONFIG_NFT_BRIDGE_META )if (ctx->family ==NFPROTO_BRIDGE )return ERR_PTR (-EAGAIN );#endif
Signature · 1 line
2.11.0