From: Florian Westphal Date: Fri, 27 Apr 2018 20:37:43 +0000 (+0200) Subject: netfilter: nft_dynset: fix timeout updates on 32bit X-Git-Tag: v4.19~872^2~308^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b13468dc577498002cf4e62978359ff97ffcd187;p=platform%2Fkernel%2Flinux-rpi.git 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: 8e1102d5a1596 ("netfilter: nf_tables: support timeouts larger than 23 days") Signed-off-by: Florian Westphal Signed-off-by: Pablo Neira Ayuso --- diff --git a/net/netfilter/nft_dynset.c b/net/netfilter/nft_dynset.c index 5cc3509..b07a3fd 100644 --- a/net/netfilter/nft_dynset.c +++ b/net/netfilter/nft_dynset.c @@ -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)