This is a note to let you know that I've just added the patch titled
netfilter: nft_quota: copy content when cloning expression
to the 5.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
netfilter-nft_quota-copy-content-when-cloning-expression.patch
and it can be found in the queue-5.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From aabef97a35160461e9c576848ded737558d89055 Mon Sep 17 00:00:00 2001
From: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>
Date: Tue, 28 Feb 2023 20:43:02 +0100
Subject: netfilter: nft_quota: copy content when cloning expression
From: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>
commit aabef97a35160461e9c576848ded737558d89055 upstream.
If the ruleset contains consumed quota, restore them accordingly.
Otherwise, listing after restoration shows never used items.
Restore the user-defined quota and flags too.
Fixes: ed0a0c60f0e5 ("netfilter: nft_quota: move stateful fields out of expression data")
Signed-off-by: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
net/netfilter/nft_quota.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
--- a/net/netfilter/nft_quota.c
+++ b/net/netfilter/nft_quota.c
@@ -235,12 +235,16 @@ static void nft_quota_destroy(const stru
static int nft_quota_clone(struct nft_expr *dst, const struct nft_expr *src)
{
struct nft_quota *priv_dst = nft_expr_priv(dst);
+ struct nft_quota *priv_src = nft_expr_priv(src);
+
+ priv_dst->quota = priv_src->quota;
+ priv_dst->flags = priv_src->flags;
priv_dst->consumed = kmalloc(sizeof(*priv_dst->consumed), GFP_ATOMIC);
if (!priv_dst->consumed)
return -ENOMEM;
- atomic64_set(priv_dst->consumed, 0);
+ *priv_dst->consumed = *priv_src->consumed;
return 0;
}
Patches currently in stable-queue which might be from pablo@xxxxxxxxxxxxx are
queue-5.15/netfilter-nf_tables-check-if-catch-all-set-element-is-active-in-next-generation.patch
queue-5.15/netfilter-nft_quota-move-stateful-fields-out-of-expr.patch
queue-5.15/ipvs-avoid-stat-macros-calls-from-preemptible-contex.patch
queue-5.15/netfilter-nf_tables-skip-dead-set-elements-in-netlin.patch
queue-5.15/netfilter-nft_last-copy-content-when-cloning-expression.patch
queue-5.15/netfilter-nft_limit-move-stateful-fields-out-of-expr.patch
queue-5.15/netfilter-nft_connlimit-memleak-if-nf_ct_netns_get-fails.patch
queue-5.15/netfilter-nft_connlimit-move-stateful-fields-out-of-.patch
queue-5.15/netfilter-nft_limit-fix-stateful-object-memory-leak.patch
queue-5.15/netfilter-nf_tables-memcg-accounting-for-dynamically.patch
queue-5.15/netfilter-nf_tables-reject-invalid-set-policy.patch
queue-5.15/netfilter-nf_tables-do-not-allow-mismatch-field-size.patch
queue-5.15/netfilter-nft_last-move-stateful-fields-out-of-expre.patch
queue-5.15/netfilter-nft_quota-copy-content-when-cloning-expression.patch
queue-5.15/netfilter-nft_limit-clone-packet-limits-cost-value.patch
queue-5.15/netfilter-nf_tables-mark-newset-as-dead-on-transacti.patch
queue-5.15/netfilter-nf_tables-typo-null-check-in-_clone-function.patch
queue-5.15/netfilter-nft_limit-rename-stateful-structure.patch
queue-5.15/netfilter-nf_tables-reject-nft_set_concat-with-not-f.patch
queue-5.15/netfilter-nft_limit-do-not-ignore-unsupported-flags.patch
