Commit 33c7aba0 authored Nov 14, 2022 by Pablo Neira Ayuso

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: 65038428 ("netfilter: nf_tables: allow to specify stateful expression in set definition")
Fixes: 8d8540c4 ("netfilter: nft_set_rbtree: add timeout support")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

parent 52d1aa8b

net/netfilter/nf_tables_api.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -5958,7 +5958,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 = set->timeout;
		}

		@@ -6024,7 +6025,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;