netfilter: nf_tables: add nft_expr_type_request_module()
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH 1/3 netfilter: nf_tables: add nft_expr_type_request_module()
This helper function makes sure the family specific extension is loaded.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- net/netfilter/nf_tables_api.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-)
net/netfilter/nf_tables_api.c +14 -3
@@ -2019,6 +2019,19 @@ static const struct nft_expr_type *__nft_expr_type_get(u8 family,return NULL ; } +#ifdef CONFIG_MODULES +static int nft_expr_type_request_module (struct net *net,u8 family, +struct nlattr *nla) +{ +nft_request_module (net,"nft-expr-%u-%.*s" , family, +nla_len (nla), (char *)nla_data (nla)); +if (__nft_expr_type_get (family, nla)) +return -EAGAIN ; + +return 0 ; +} +#endif +static const struct nft_expr_type *nft_expr_type_get (struct net *net,u8 family,struct nlattr *nla)
@@ -2035,9 +2048,7 @@ static const struct nft_expr_type *nft_expr_type_get(struct net *net,lockdep_nfnl_nft_mutex_not_held ();#ifdef CONFIG_MODULES if (type ==NULL ) { -nft_request_module (net,"nft-expr-%u-%.*s" , family, -nla_len (nla), (char *)nla_data (nla)); -if (__nft_expr_type_get (family, nla)) +if (nft_expr_type_request_module (net, family, nla) == -EAGAIN )return ERR_PTR (-EAGAIN ); nft_request_module(net, "nft-expr-%.*s",
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 2/3 netfilter: nf_tables: __nft_expr_type_get() selects specific family type
In case that there are two types, prefer the family specify extension.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- net/netfilter/nf_tables_api.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
net/netfilter/nf_tables_api.c +8 -5
@@ -2009,14 +2009,17 @@ EXPORT_SYMBOL_GPL(nft_unregister_expr);static const struct nft_expr_type *__nft_expr_type_get (u8 family,struct nlattr *nla) { -const struct nft_expr_type *type; +const struct nft_expr_type *type, *candidate =NULL ;list_for_each_entry (type, &nf_tables_expressions, list) { -if (!nla_strcmp (nla, type->name) && - (!type->family || type->family == family)) -return type; +if (!nla_strcmp (nla, type->name)) { +if (!type->family && !candidate) + candidate = type; +else if (type->family == family) + candidate = type; + } } -return NULL ; +return candidate; }#ifdef CONFIG_MODULES
Signature · 1 line
2.11.0
Pablo Neira Ayuso
maintainerPATCH 3/3 netfilter: nf_tables: force module load in case select_ops() returns -EAGAIN
In reply to Pablo Neira Ayusonft_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 <[email protected]>
--- net/netfilter/nf_tables_api.c | 6 ++++++ net/netfilter/nft_meta.c | 4 ++++ 2 files changed, 10 insertions(+)
net/netfilter/nf_tables_api.c +6 -0
@@ -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
net/netfilter/nft_meta.c +4 -0
@@ -516,6 +516,10 @@ nft_meta_select_ops(const struct nft_ctx *ctx,if (tb[NFTA_META_KEY ] ==NULL )return ERR_PTR (-EINVAL ); +#ifdef CONFIG_NF_TABLES_BRIDGE +if (ctx->family ==NFPROTO_BRIDGE ) +return ERR_PTR (-EAGAIN ); +#endif if (tb[NFTA_META_DREG ] && tb[NFTA_META_SREG ])return ERR_PTR (-EINVAL );
Signature · 1 line
2.11.0