Correct the upto value during list conntrack information

The problem:
When list numerous conntrack information from /proc/net/ip_conntrack,
we found some items are missing.

The solution:
This patch correct the upto value in conntrack_iterate() when the length
of conntrack information exceed the max length.

Cc: Patrick McHardy <kaber@trash.net>
Cc: coreteam@netfilter.org
Signed-off-by: Willy Tarreau <w@1wt.eu>

diff --git a/net/ipv4/netfilter/ip_conntrack_standalone.c b/net/ipv4/netfilter/ip_conntrack_standalone.c
index c64a3a7..8ca7334 100644 (file)
--- a/net/ipv4/netfilter/ip_conntrack_standalone.c
+++ b/net/ipv4/netfilter/ip_conntrack_standalone.c
@@ -131,8 +131,11 @@ conntrack_iterate(const struct ip_conntrack_tuple_hash *hash,
                return 0;
 
        newlen = print_conntrack(buffer + *len, hash->ctrack);
-       if (*len + newlen > maxlen)
+
+       if (*len + newlen > maxlen) {
+               (*upto)--;
                return 1;
+       }
        else *len += newlen;
 
        return 0;