Patch "netfilter: nft_last: copy content when cloning expression" has been added to the 6.1-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    netfilter: nft_last: copy content when cloning expression

to the 6.1-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_last-copy-content-when-cloning-express.patch
and it can be found in the queue-6.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit e783b408844577a55476cd479a55a91be0e4d9d5
Author: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>
Date:   Tue Feb 28 17:09:03 2023 +0100

    netfilter: nft_last: copy content when cloning expression
    
    [ Upstream commit 860e874290fb3be08e966c9c8ffc510c5b0f2bd8 ]
    
    If the ruleset contains last timestamps, restore them accordingly.
    Otherwise, listing after restoration shows never used items.
    
    Fixes: 33a24de37e81 ("netfilter: nft_last: move stateful fields out of expression data")
    Signed-off-by: Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/net/netfilter/nft_last.c b/net/netfilter/nft_last.c
index bb15a55dad5c0..eaa54964cf23c 100644
--- a/net/netfilter/nft_last.c
+++ b/net/netfilter/nft_last.c
@@ -104,11 +104,15 @@ static void nft_last_destroy(const struct nft_ctx *ctx,
 static int nft_last_clone(struct nft_expr *dst, const struct nft_expr *src)
 {
 	struct nft_last_priv *priv_dst = nft_expr_priv(dst);
+	struct nft_last_priv *priv_src = nft_expr_priv(src);
 
 	priv_dst->last = kzalloc(sizeof(*priv_dst->last), GFP_ATOMIC);
 	if (!priv_dst->last)
 		return -ENOMEM;
 
+	priv_dst->last->set = priv_src->last->set;
+	priv_dst->last->jiffies = priv_src->last->jiffies;
+
 	return 0;
 }