Commit b13468dc authored Apr 27, 2018 by Florian Westphal Committed by Pablo Neira Ayuso May 07, 2018

netfilter: nft_dynset: fix timeout updates on 32bit



This must now use a 64bit jiffies value, else we set
a bogus timeout on 32bit.

Fixes: 8e1102d5 ("netfilter: nf_tables: support timeouts larger than 23 days")
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

parent 538c5672

net/netfilter/nft_dynset.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -81,7 +81,7 @@ static void nft_dynset_eval(const struct nft_expr *expr,
		if (priv->op == NFT_DYNSET_OP_UPDATE &&
		nft_set_ext_exists(ext, NFT_SET_EXT_EXPIRATION)) {
		timeout = priv->timeout ? : set->timeout;
		*nft_set_ext_expiration(ext) = jiffies + timeout;
		*nft_set_ext_expiration(ext) = get_jiffies_64() + timeout;
		}

		if (sexpr != NULL)