From: Pablo Neira Ayuso Date: Sat, 16 Jan 2021 18:20:15 +0000 (+0100) Subject: netfilter: nft_dynset: add timeout extension to template X-Git-Tag: rel_imx_5.10.35_2.0.0-somdevices.0~363^2~1984 X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=28adabf8cdd23e5749b9711476095322b1da2d8c;p=linux.git 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: 22fe54d5fefc ("netfilter: nf_tables: add support for dynamic set updates") Signed-off-by: Pablo Neira Ayuso Signed-off-by: Greg Kroah-Hartman --- diff --git a/net/netfilter/nft_dynset.c b/net/netfilter/nft_dynset.c index 4990f7cbfafd..5c84a968dae2 100644 --- a/net/netfilter/nft_dynset.c +++ b/net/netfilter/nft_dynset.c @@ -204,8 +204,10 @@ 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;