diff options
| author | Pablo Neira Ayuso | 2019-07-05 23:38:54 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso | 2019-07-06 08:37:36 +0200 |
| commit | 0ef1efd1354d732d040f29b2005420f83fcdd8f4 (patch) | |
| tree | 3ccecab23ef06ae80c4cc449ae33ff17edbf8947 /net/netfilter | |
| parent | netfilter: nf_tables: __nft_expr_type_get() selects specific family type (diff) | |
| download | kernel-qcow2-linux-0ef1efd1354d732d040f29b2005420f83fcdd8f4.tar.gz kernel-qcow2-linux-0ef1efd1354d732d040f29b2005420f83fcdd8f4.tar.xz kernel-qcow2-linux-0ef1efd1354d732d040f29b2005420f83fcdd8f4.zip | |
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>
Diffstat (limited to 'net/netfilter')
| -rw-r--r-- | net/netfilter/nf_tables_api.c | 6 | ||||
| -rw-r--r-- | net/netfilter/nft_meta.c | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index 5e97bf64975a..d22d00ca78c1 100644 --- 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 18a848b01759..417f8d32e9a3 100644 --- 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; |