netfilter: nft_dynset: fix timeout updates on 32bit

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

Florian Westphal committed 8 years ago

Commit b13468d1 parent 538c5671 file · +1 −1Browse files

Unified · Split

@@ -81,7 +81,7 @@ static void nft_dynset_eval(const struct nft_expr *expr, · 80 unmodified lines
81	if (priv->op == NFT_DYNSET_OP_UPDATE &&	81	if (priv->op == NFT_DYNSET_OP_UPDATE &&
82	nft_set_ext_exists(ext, NFT_SET_EXT_EXPIRATION)) {	82	nft_set_ext_exists(ext, NFT_SET_EXT_EXPIRATION)) {
83	timeout = priv->timeout ? : set->timeout;	83	timeout = priv->timeout ? : set->timeout;
84	*nft_set_ext_expiration(ext) = jiffies + timeout;	84	*nft_set_ext_expiration(ext) = get_jiffies_64() + timeout;
85	}	85	}
86		86
87	if (sexpr != NULL)	87	if (sexpr != NULL)