Commit 95b1e6e1 authored Jan 16, 2021 by Pablo Neira Ayuso Committed by Greg Kroah-Hartman Feb 03, 2021

netfilter: nft_dynset: add timeout extension to template

commit 0c5b7a501e7400869ee905b4f7af3d6717802bcb upstream.

Otherwise, the newly create element shows no timeout when listing the
ruleset. If the set definition does not specify a default timeout, then
the set element only shows the expiration time, but not the timeout.
This is a problem when restoring a stateful ruleset listing since it
skips the timeout policy entirely.

Fixes: 22fe54d5 ("netfilter: nf_tables: add support for dynamic set updates")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent ccdabbf5

net/netfilter/nft_dynset.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -213,9 +213,11 @@ static int nft_dynset_init(const struct nft_ctx *ctx,
		nft_set_ext_add_length(&priv->tmpl, NFT_SET_EXT_EXPR,
		priv->expr->ops->size);
		if (set->flags & NFT_SET_TIMEOUT) {
		if (timeout \|\| set->timeout)
		if (timeout \|\| set->timeout) {
		nft_set_ext_add(&priv->tmpl, NFT_SET_EXT_TIMEOUT);
		nft_set_ext_add(&priv->tmpl, NFT_SET_EXT_EXPIRATION);
		}
		}

		priv->timeout = timeout;