netfilter stable fixes for 5.15
Subsystems (2)
Pablo Neira Ayuso
maintainerv2 cover netfilter stable fixes for 5.15
Hi Greg, Sasha,
[ this is v2, using "Upstream commit tag XYZ" as suggested by Salvatore Bonaccorso,
only this comestic change in this batch. ]
The following list shows the backported patches, I am using original commit IDs for reference:
1) 628bd3e49cba ("netfilter: nf_tables: drop map element references from preparation phase")
2) 3e70489721b6 ("netfilter: nf_tables: unbind non-anonymous set if rule construction fails")
Please, apply.
Thanks.
Pablo Neira Ayuso (2):
netfilter: nf_tables: drop map element references from preparation phase
netfilter: nf_tables: unbind non-anonymous set if rule construction fails
include/net/netfilter/nf_tables.h | 5 +- net/netfilter/nf_tables_api.c | 147 ++++++++++++++++++++++++++---- net/netfilter/nft_set_bitmap.c | 5 +- net/netfilter/nft_set_hash.c | 23 ++++- net/netfilter/nft_set_pipapo.c | 14 ++- net/netfilter/nft_set_rbtree.c | 5 +- 6 files changed, 168 insertions(+), 31 deletions(-)
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH v2 1/2 netfilter: nf_tables: drop map element references from preparation phase
[ Upstream commit 628bd3e49cba1c066228e23d71a852c23e26da73 ]
set .destroy callback releases the references to other objects in maps. This is very late and it results in spurious EBUSY errors. Drop refcount from the preparation phase instead, update set backend not to drop reference counter from set .destroy path.
Exceptions: NFT_TRANS_PREPARE_ERROR does not require to drop the reference counter because the transaction abort path releases the map references for each element since the set is unbound. The abort path also deals with releasing reference counter for new elements added to unbound sets.
--- include/net/netfilter/nf_tables.h | 5 +- net/netfilter/nf_tables_api.c | 145 ++++++++++++++++++++++++++---- net/netfilter/nft_set_bitmap.c | 5 +- net/netfilter/nft_set_hash.c | 23 +++-- net/netfilter/nft_set_pipapo.c | 14 +-- net/netfilter/nft_set_rbtree.c | 5 +- 6 files changed, 166 insertions(+), 31 deletions(-)
include/net/netfilter/nf_tables.h +4 -1
@@ -437,7 +437,8 @@ struct nft_set_ops {int (*init)(const struct nft_set *set,const struct nft_set_desc *desc,const struct nlattr *const nla[]); -void (*destroy)(const struct nft_set *set); +void (*destroy)(const struct nft_ctx *ctx, +const struct nft_set *set);void (*gc_init)(const struct nft_set *set);unsigned int elemsize;
@@ -772,6 +773,8 @@ int nft_set_elem_expr_clone(const struct nft_ctx *ctx, struct nft_set *set, struct nft_expr *expr_array[]);void nft_set_elem_destroy (const struct nft_set *set,void *elem,bool destroy_expr); +void nf_tables_set_elem_destroy (const struct nft_ctx *ctx, +const struct nft_set *set,void *elem);/** * struct nft_set_gc_batch_head - nf_tables set garbage collection batch
net/netfilter/nf_tables_api.c +129 -16
226 lines not on this page · raw message
net/netfilter/nft_set_bitmap.c +3 -2
@@ -271,13 +271,14 @@ static int nft_bitmap_init(const struct nft_set *set,return 0 ; } -static void nft_bitmap_destroy (const struct nft_set *set) +static void nft_bitmap_destroy (const struct nft_ctx *ctx, +const struct nft_set *set) {struct nft_bitmap *priv =nft_set_priv (set);struct nft_bitmap_elem *be, *n;list_for_each_entry_safe (be, n, &priv->list, head) -nft_set_elem_destroy (set, be, true); +nf_tables_set_elem_destroy (ctx, set, be); } static bool nft_bitmap_estimate(const struct nft_set_desc *desc, u32 features,
net/netfilter/nft_set_hash.c +18 -5
@@ -400,19 +400,31 @@ static int nft_rhash_init(const struct nft_set *set,return 0 ; } +struct nft_rhash_ctx { +const struct nft_ctx ctx; +const struct nft_set *set; +}; +static void nft_rhash_elem_destroy (void *ptr,void *arg) { -nft_set_elem_destroy (arg, ptr, true); +struct nft_rhash_ctx *rhash_ctx = arg; + +nf_tables_set_elem_destroy (&rhash_ctx->ctx, rhash_ctx->set, ptr); } -static void nft_rhash_destroy (const struct nft_set *set) +static void nft_rhash_destroy (const struct nft_ctx *ctx, +const struct nft_set *set) {struct nft_rhash *priv =nft_set_priv (set); +struct nft_rhash_ctx rhash_ctx = { + .ctx = *ctx, + .set = set, + };cancel_delayed_work_sync (&priv->gc_work);rcu_barrier ();rhashtable_free_and_destroy (&priv->ht, nft_rhash_elem_destroy, - (void *)set); + (void *)&rhash_ctx); }/* Number of buckets is stored in u32, so cap our result to 1U<<31 */
@@ -643,7 +655,8 @@ static int nft_hash_init(const struct nft_set *set,return 0 ; } -static void nft_hash_destroy (const struct nft_set *set) +static void nft_hash_destroy (const struct nft_ctx *ctx, +const struct nft_set *set) {struct nft_hash *priv =nft_set_priv (set);struct nft_hash_elem *he;
@@ -653,7 +666,7 @@ static void nft_hash_destroy(const struct nft_set *set)for (i =0 ; i < priv->buckets; i++) {hlist_for_each_entry_safe (he, next, &priv->table[i], node) {hlist_del_rcu (&he->node); -nft_set_elem_destroy (set, he, true); +nf_tables_set_elem_destroy (ctx, set, he); } } }
net/netfilter/nft_set_pipapo.c +9 -5
@@ -2152,10 +2152,12 @@ static int nft_pipapo_init(const struct nft_set *set,/** * nft_set_pipapo_match_destroy() - Destroy elements from key mapping array +* @ctx: context * @set: nftables API set representation * @m: matching data pointing to key mapping array */ -static void nft_set_pipapo_match_destroy (const struct nft_set *set, +static void nft_set_pipapo_match_destroy (const struct nft_ctx *ctx, +const struct nft_set *set,struct nft_pipapo_match *m) {struct nft_pipapo_field *f;
@@ -2172,15 +2174,17 @@ static void nft_set_pipapo_match_destroy(const struct nft_set *set, e = f->mt[r].e; -nft_set_elem_destroy (set, e, true); +nf_tables_set_elem_destroy (ctx, set, e); } }/** * nft_pipapo_destroy() - Free private data for set and all committed elements +* @ctx: context * @set: nftables API set representation */ -static void nft_pipapo_destroy (const struct nft_set *set) +static void nft_pipapo_destroy (const struct nft_ctx *ctx, +const struct nft_set *set) {struct nft_pipapo *priv =nft_set_priv (set);struct nft_pipapo_match *m;
@@ -2190,7 +2194,7 @@ static void nft_pipapo_destroy(const struct nft_set *set)if (m) {rcu_barrier (); -nft_set_pipapo_match_destroy (set, m); +nft_set_pipapo_match_destroy (ctx, set, m);#ifdef NFT_PIPAPO_ALIGN free_percpu (m->scratch_aligned);
@@ -2207,7 +2211,7 @@ static void nft_pipapo_destroy(const struct nft_set *set) m = priv->clone;if (priv->dirty) -nft_set_pipapo_match_destroy (set, m); +nft_set_pipapo_match_destroy (ctx, set, m);#ifdef NFT_PIPAPO_ALIGN free_percpu (priv->clone->scratch_aligned);
net/netfilter/nft_set_rbtree.c +3 -2
@@ -664,7 +664,8 @@ static int nft_rbtree_init(const struct nft_set *set,return 0 ; } -static void nft_rbtree_destroy (const struct nft_set *set) +static void nft_rbtree_destroy (const struct nft_ctx *ctx, +const struct nft_set *set) {struct nft_rbtree *priv =nft_set_priv (set);struct nft_rbtree_elem *rbe;
@@ -675,7 +676,7 @@ static void nft_rbtree_destroy(const struct nft_set *set)while ((node = priv->root.rb_node) !=NULL ) {rb_erase (node, &priv->root); rbe = rb_entry(node, struct nft_rbtree_elem, node); -nft_set_elem_destroy (set, rbe, true); +nf_tables_set_elem_destroy (ctx, set, rbe); } }
Signature · 1 line
2.30.2
Pablo Neira Ayuso
maintainerPATCH v2 2/2 netfilter: nf_tables: unbind non-anonymous set if rule construction fails
In reply to Pablo Neira Ayuso[ Upstream commit 3e70489721b6c870252c9082c496703677240f53 ]
Otherwise a dangling reference to a rule object that is gone remains in the set binding list.
--- net/netfilter/nf_tables_api.c | 2 ++ 1 file changed, 2 insertions(+)
net/netfilter/nf_tables_api.c +2 -0
@@ -5042,6 +5042,8 @@ void nf_tables_deactivate_set(const struct nft_ctx *ctx, struct nft_set *set,nft_set_trans_unbind (ctx, set);if (nft_set_is_anonymous (set))nft_deactivate_next (ctx->net, set); +else +list_del_rcu (&binding->list); set->use--;break ;
Signature · 1 line
2.30.2