diff options
| author |   Florian Westphal <fw@strlen.de> | 2018-04-27 22:37:43 +0200 |
|---|---|---|
| committer |   Pablo Neira Ayuso <pablo@netfilter.org> | 2018-05-07 00:05:22 +0200 |
| commit | b13468dc577498002cf4e62978359ff97ffcd187 (patch) | |
| tree | 858daaf66615201d2c5274a963d0b856f83a932d /net/netfilter/nft_dynset.c | |
| parent | netfilter: ctnetlink: export nf_conntrack_max (diff) | |
| download | linux-dev-b13468dc577498002cf4e62978359ff97ffcd187.tar.xz linux-dev-b13468dc577498002cf4e62978359ff97ffcd187.zip | |
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 <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/netfilter/nft_dynset.c')
| -rw-r--r-- | net/netfilter/nft_dynset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/nft_dynset.c b/net/netfilter/nft_dynset.c index 5cc3509659c6..b07a3fd9eeea 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) |