netfilter: nft_meta: skip EAGAIN if nft_meta_bridge is not a module
Subsystems (3)
Pablo Neira Ayuso
maintainerPATCH 1/2 netfilter: nft_meta: skip EAGAIN if nft_meta_bridge is not a module
If it is a module, request this module. Otherwise, if it is compiled built-in or not selected, skip this.
Fixes 0ef1efd1354d ("netfilter: nf_tables: force module load in case select_ops() returns -EAGAIN")
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- 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 2/2 netfilter: bridge: NF_CONNTRACK_BRIDGE does not depend on NF_TABLES_BRIDGE
Place NF_CONNTRACK_BRIDGE away from the NF_TABLES_BRIDGE dependency.
Fixes 3c171f496ef5 ("netfilter: bridge: add connection tracking system")
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- 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