netfilter: nf_tables: skip double clone set expressions on element insert
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH v3 1/1 netfilter: nf_tables: skip double clone set expressions on element insert
Both the dynset and newsetelem path clone the existing set expressions when setting set element expressions if no override expressions are provided. This results in a double clone, once to clone the template set expressions then another clone on the new element. Add a flag to annotate if userspace provides a override expression (ie. expression of the same type of the set but different configuration), otherwise borrow the existing expression from the set. Add conditionals to release expression iif they represent an override.
This simplifies the existing logic and it also fixes a bug with the connlimit expression which results in a module refcount imbalance WARNING splat when resorting on the default set expressions.
---
v3: update missing spot in nft_dynset to address leak in error path.
include/net/netfilter/nf_tables.h | 2 -- net/netfilter/nf_tables_api.c | 56 ++++++++++--------------------- net/netfilter/nft_dynset.c | 23 ++++++++----- 3 files changed, 32 insertions(+), 49 deletions(-)
include/net/netfilter/nf_tables.h +0 -2
@@ -870,8 +870,6 @@ struct nft_elem_priv *nft_set_elem_init(const struct nft_set *set, const u32 *key, const u32 *key_end, const u32 *data, u64 timeout, u64 expiration, gfp_t gfp); -int nft_set_elem_expr_clone (const struct nft_ctx *ctx,struct nft_set *set, -struct nft_expr *expr_array[]);void nft_set_elem_expr_destroy (const struct nft_ctx *ctx,struct nft_set_elem_expr *elem_expr); void nft_set_elem_destroy(const struct nft_set *set,
net/netfilter/nf_tables_api.c +18 -38
114 lines not on this page · raw message
net/netfilter/nft_dynset.c +14 -9
@@ -19,7 +19,8 @@ struct nft_dynset {u8 sreg_key;u8 sreg_data;bool invert; -bool expr; + bool expr:1, + override_exprs:1;u8 num_exprs;u64 timeout;struct nft_expr *expr_array[NFT_SET_EXPR_MAX ];
@@ -257,6 +258,7 @@ static int nft_dynset_init(const struct nft_ctx *ctx, priv->num_exprs++; priv->expr_array[0 ] = dynset_expr; + priv->override_exprs = true; if (set->num_exprs > 1 || (set->num_exprs == 1 &&
@@ -289,6 +291,7 @@ static int nft_dynset_init(const struct nft_ctx *ctx, } priv->expr_array[i] = dynset_expr; priv->num_exprs++; + priv->override_exprs = true;if (set->num_exprs) {if (i >= set->num_exprs) {
@@ -307,9 +310,8 @@ static int nft_dynset_init(const struct nft_ctx *ctx, goto err_expr_free; } }else if (set->num_exprs >0 ) { - err =nft_set_elem_expr_clone (ctx, set, priv->expr_array); -if (err <0 ) -return err; +for (i =0 ; i < set->num_exprs; i++) + priv->expr_array[i] = set->exprs[i]; priv->num_exprs = set->num_exprs; }
@@ -339,8 +341,10 @@ static int nft_dynset_init(const struct nft_ctx *ctx,return 0 ; err_expr_free: -for (i =0 ; i < priv->num_exprs; i++) -nft_expr_destroy (ctx, priv->expr_array[i]); +if (priv->override_exprs) { +for (i =0 ; i < priv->num_exprs; i++) +nft_expr_destroy (ctx, priv->expr_array[i]); + }return err; }
@@ -367,9 +371,10 @@ static void nft_dynset_destroy(const struct nft_ctx *ctx,struct nft_dynset *priv =nft_expr_priv (expr);int i; -for (i =0 ; i < priv->num_exprs; i++) -nft_expr_destroy (ctx, priv->expr_array[i]); - +if (priv->override_exprs) { +for (i =0 ; i < priv->num_exprs; i++) +nft_expr_destroy (ctx, priv->expr_array[i]); + }nf_tables_destroy_set (ctx, priv->set); }
Signature · 1 line
2.47.3