Merge tag 'v6.18.15' into 6.18-main

This is the 6.18.15 stable release

# -----BEGIN PGP SIGNATURE-----
#
# iQIzBAABCgAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmmiBwkACgkQONu9yGCS
# aT4GqA//dLJs+lcaZVWtEt5+2GGnZvqwMV0YpvFpO2kWBGFKKmKPTSBwDSJusXOO
# ohHr9pFf8hG8lLk6nPx234/vsHJS4HU8/ggbVSBLqIboQ5WHlLNtr5nXaNx4l6Nz
# ES9YSZ2u5y5QsNJhAx8/Hu8bIPpT2I9FKIn+DzPStZ3BFSnMBfw0eWeZbSA9qP2n
# 2e+0DM47tKYJgxLN9Roq+eP9rtCXaP5xiPWVvbpW/W9d6KY02S39TgE7JFqm5VLw
# E4E2yx1Ty9dzMA0KOxcrK92+Tj6f/1p+5XC9DoeJ/Ken4NojUYrGdK//nL+9tJfA
# hm/FHLgv7jFQPNApZx1amRkMVl9q3iljd7VrtRwM57m+Gq+woKzmSPVKnvnMmv+2
# dx8FviyqFeyNYtQZfbEsr9CphrYWun/TsLPXbyXfJOKtBEOLNY8+bgkuJe06txma
# Eu2lKV8Bktz8yRhq05H7kg99LQfdFlckqwYOjo5Z5aLtF0QTLv1AU6AETeXG9LXc
# GIvS6lQ1AjQ+t+OfRBiRO01+NHc7pViR2p0a669sI6qJLlyvtbqYg6e5JgSU4JZU
# k2WqE3yHyd3KzguGPlIUrtiqcFKRR3wXta3KH3tN2ET/795KFoy3UVYMr4ZMOp/P
# NWaEnHRcodVb+q/h4wsgvQkQe/uAE/7Ckl2vJykzyGZdrOz6tTs=
# =WQG0
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri Feb 27 22:05:13 2026 CET
# gpg:                using RSA key 647F28654894E3BD457199BE38DBBDC86092693E
# gpg: Can't check signature: No public key

Author: frank-w

Makefile

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 6
 PATCHLEVEL = 18
-SUBLEVEL = 14
+SUBLEVEL = 15
 EXTRAVERSION =
 NAME = Baby Opossum Posse
 

include/net/netfilter/nf_tables.h

@@ -456,6 +456,7 @@ struct nft_set_ext;
  *	@init: initialize private data of new set instance
  *	@destroy: destroy private data of set instance
  *	@gc_init: initialize garbage collection
+ *	@abort_skip_removal: skip removal of elements from abort path
  *	@elemsize: element private size
  *
  *	Operations lookup, update and delete have simpler interfaces, are faster
@@ -513,6 +514,7 @@ struct nft_set_ops {
 						   const struct nft_set *set);
 	void				(*gc_init)(const struct nft_set *set);
 
+	bool				abort_skip_removal;
 	unsigned int			elemsize;
 };
 

net/netfilter/nf_tables_api.c

@@ -7821,7 +7821,8 @@ static bool nft_trans_elems_new_abort(const struct nft_ctx *ctx,
 			continue;
 		}
 
-		if (!te->set->ops->abort || nft_setelem_is_catchall(te->set, te->elems[i].priv))
+		if (!te->set->ops->abort_skip_removal ||
+		    nft_setelem_is_catchall(te->set, te->elems[i].priv))
 			nft_setelem_remove(ctx->net, te->set, te->elems[i].priv);
 
 		if (!nft_setelem_is_catchall(te->set, te->elems[i].priv))

net/netfilter/nft_set_pipapo.c

@@ -2370,6 +2370,7 @@ const struct nft_set_type nft_set_pipapo_type = {
 		.gc_init	= nft_pipapo_gc_init,
 		.commit		= nft_pipapo_commit,
 		.abort		= nft_pipapo_abort,
+		.abort_skip_removal = true,
 		.elemsize	= offsetof(struct nft_pipapo_elem, ext),
 	},
 };
@@ -2394,6 +2395,7 @@ const struct nft_set_type nft_set_pipapo_avx2_type = {
 		.gc_init	= nft_pipapo_gc_init,
 		.commit		= nft_pipapo_commit,
 		.abort		= nft_pipapo_abort,
+		.abort_skip_removal = true,
 		.elemsize	= offsetof(struct nft_pipapo_elem, ext),
 	},
 };