netfilter: conntrack: adjust stop timestamp to real expiry value
authorFlorian Westphal <fw@strlen.de>
Sun, 18 Jul 2021 16:36:00 +0000 (18:36 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 4 Aug 2021 09:58:03 +0000 (11:58 +0200)
commit789a3a3c94a8f594612543969a2d125178d17941
treeb28583c976cc112e2238a6f8725179c690c4e54c
parentf6ba582293b84ab28b8e3e7a2cc5f99bedecb6c4
netfilter: conntrack: adjust stop timestamp to real expiry value

[ Upstream commit 30a56a2b881821625f79837d4d968c679852444e ]

In case the entry is evicted via garbage collection there is
delay between the timeout value and the eviction event.

This adjusts the stop value based on how much time has passed.

Fixes: b87a2f9199ea82 ("netfilter: conntrack: add gc worker to remove timed-out entries")
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
net/netfilter/nf_conntrack_core.c