netfilter: nf_tables: force module load in case select_ops() returns -EAGAIN

nft_meta needs to pull in the nft_meta_bridge module in case that this
is a bridge family rule from the select_ops() path.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index 5e97bf64975a002b716c77e0c4681d2404602797..d22d00ca78c1770fc4bfacf72259e34bf7c2e7e3 100644 (file)
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -2144,6 +2144,12 @@ static int nf_tables_expr_parse(const struct nft_ctx *ctx,
                                       (const struct nlattr * const *)info->tb);
                if (IS_ERR(ops)) {
                        err = PTR_ERR(ops);
+#ifdef CONFIG_MODULES
+                       if (err == -EAGAIN)
+                               nft_expr_type_request_module(ctx->net,
+                                                            ctx->family,
+                                                            tb[NFTA_EXPR_NAME]);
+#endif
                        goto err1;
                }
        } else

diff --git a/net/netfilter/nft_meta.c b/net/netfilter/nft_meta.c
index 18a848b0175971d7d39aaf4d061630a9e298acdc..417f8d32e9a3963508f1b4c445d6c558e1f93da0 100644 (file)
--- a/net/netfilter/nft_meta.c
+++ b/net/netfilter/nft_meta.c
@@ -519,6 +519,10 @@ 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 (ctx->family == NFPROTO_BRIDGE)
+               return ERR_PTR(-EAGAIN);
+#endif
        if (tb[NFTA_META_DREG])
                return &nft_meta_get_ops;