netfilter: ipset: List timing out entries with "timeout 1" instead of zero
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Thu, 31 May 2018 16:45:21 +0000 (18:45 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 3 Aug 2018 05:55:13 +0000 (07:55 +0200)
commit6e02c062e94a235b50dd2ec15068026e3a841c1e
tree2e524537e003f66a1f417bffd12ba00ce56326f3
parent56295051214ef9616d90ef34a3fe43628985433f
netfilter: ipset: List timing out entries with "timeout 1" instead of zero

[ Upstream commit bd975e691486ba52790ba23cc9b4fecab7bc0d31 ]

When listing sets with timeout support, there's a probability that
just timing out entries with "0" timeout value is listed/saved.
However when restoring the saved list, the zero timeout value means
permanent elelements.

The new behaviour is that timing out entries are listed with "timeout 1"
instead of zero.

Fixes netfilter bugzilla #1258.

Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
include/linux/netfilter/ipset/ip_set_timeout.h