netfilter: nf_tables: pass flags to set backend selection routine
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH 1/1 netfilter: nf_tables: pass flags to set backend selection routine
No need to refetch the flag from the netlink attribute, pass the existing flags variable which already provide validated flags.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- net/netfilter/nf_tables_api.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
net/netfilter/nf_tables_api.c +2 -7
@@ -4223,23 +4223,18 @@ static bool nft_set_ops_candidate(const struct nft_set_type *type, u32 flags)* given, in that case the amount of memory per element is used. */ static const struct nft_set_ops * -nft_select_set_ops (const struct nft_ctx *ctx, -const struct nlattr *const nla[], +nft_select_set_ops (const struct nft_ctx *ctx,u32 flags,const struct nft_set_desc *desc) {struct nftables_pernet *nft_net =nft_pernet (ctx->net);const struct nft_set_ops *ops, *bops;struct nft_set_estimate est, best;const struct nft_set_type *type; -u32 flags =0 ;int i;lockdep_assert_held (&nft_net->commit_mutex);lockdep_nfnl_nft_mutex_not_held (); -if (nla[NFTA_SET_FLAGS ] !=NULL ) - flags =ntohl (nla_get_be32 (nla[NFTA_SET_FLAGS ])); - bops =NULL ; best.size = ~0 ; best.lookup = ~0 ;
@@ -5114,7 +5109,7 @@ static int nf_tables_newset(struct sk_buff *skb, const struct nfnl_info *info,if (!(info->nlh->nlmsg_flags &NLM_F_CREATE ))return -ENOENT ; - ops =nft_select_set_ops (&ctx, nla, &desc); + ops =nft_select_set_ops (&ctx, flags, &desc);if (IS_ERR (ops))return PTR_ERR (ops);
Signature · 1 line
2.30.2