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 10:46:42 +0000 (12:46 +0200)
commit3dbda8483f4256530a926dcb6063656a17fe62d9
tree628e7b082156512650f05585d786897869d6ca5a
parentac038f4152efd8b4ad86e50df913bd318dc6daa8
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