netfilter: nf_tables: do not set up extensions for end interval

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2189550
Upstream Status: commit 33c7aba

Conflicts: net/netfilter/nf_tables_api.c

Context only: CS9 already gained the READ_ONCE(), keep that as-is.

commit 33c7aba
Author: Pablo Neira Ayuso <[email protected]>
Date:   Mon Nov 14 11:31:54 2022 +0100

    netfilter: nf_tables: do not set up extensions for end interval

    Elements with an end interval flag set on do not store extensions. The
    global set definition is currently setting on the timeout and stateful
    expression for end interval elements.

    This leads to skipping end interval elements from the set->ops->walk()
    path as the expired check bogusly reports true.

    Moreover, do not set up stateful expressions for elements with end
    interval flag set on since this is never used.

    Fixes: 6503842 ("netfilter: nf_tables: allow to specify stateful expression in set definition")
    Fixes: 8d8540c ("netfilter: nft_set_rbtree: add timeout support")
    Signed-off-by: Pablo Neira Ayuso <[email protected]>

Signed-off-by: Florian Westphal <[email protected]>

Author: fw-strlen

net/netfilter/nf_tables_api.c

@@ -5918,7 +5918,8 @@ static int nft_add_set_elem(struct nft_ctx *ctx, struct nft_set *set,
 					    &timeout);
 		if (err)
 			return err;
-	} else if (set->flags & NFT_SET_TIMEOUT) {
+	} else if (set->flags & NFT_SET_TIMEOUT &&
+		   !(flags & NFT_SET_ELEM_INTERVAL_END)) {
 		timeout = READ_ONCE(set->timeout);
 	}
 
@@ -5984,7 +5985,8 @@ static int nft_add_set_elem(struct nft_ctx *ctx, struct nft_set *set,
 			err = -EOPNOTSUPP;
 			goto err_set_elem_expr;
 		}
-	} else if (set->num_exprs > 0) {
+	} else if (set->num_exprs > 0 &&
+		   !(flags & NFT_SET_ELEM_INTERVAL_END)) {
 		err = nft_set_elem_expr_clone(ctx, set, expr_array);
 		if (err < 0)
 			goto err_set_elem_expr_clone;