FAILED: patch "[PATCH] netfilter: nft_dynset: honor stateful expressions in set" failed to apply to 5.10-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From fca05d4d61e65fa573a3768f9019a42143c03349 Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <[email protected]>
Date: Sat, 16 Jan 2021 12:26:46 +0100
Subject: [PATCH] netfilter: nft_dynset: honor stateful expressions in set
definition
If the set definition contains stateful expressions, allocate them for the newly added entries from the packet path.
Fixes 65038428b2c6 ("netfilter: nf_tables: allow to specify stateful expression in set definition")
Signed-off-by Pablo Neira Ayuso <[email protected]>
include/net/netfilter/nf_tables.h +2 -0
@@ -721,6 +721,8 @@ void *nft_set_elem_init(const struct nft_set *set,const struct nft_set_ext_tmpl *tmpl, 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_destroy (const struct nft_set *set,void *elem,bool destroy_expr);
net/netfilter/nf_tables_api.c +2 -3
@@ -5235,9 +5235,8 @@ static void nf_tables_set_elem_destroy(const struct nft_ctx *ctx,kfree (elem); } -static int nft_set_elem_expr_clone (const struct nft_ctx *ctx, -struct nft_set *set, -struct nft_expr *expr_array[]) +int nft_set_elem_expr_clone (const struct nft_ctx *ctx,struct nft_set *set, +struct nft_expr *expr_array[]) {struct nft_expr *expr;int err, i, k;
net/netfilter/nft_dynset.c +6 -0
@@ -295,6 +295,12 @@ static int nft_dynset_init(const struct nft_ctx *ctx, err = -EOPNOTSUPP ; 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; + + priv->num_exprs = set->num_exprs; }nft_set_ext_prepare (&priv->tmpl);