[NETFILTER]: Advance seq-file position in exp_next_seq()

[NETFILTER]: Advance seq-file position in exp_next_seq()

[Patrick McHardy]

[-- Attachment #1: Type: text/plain, Size: 325 bytes --]

Hi Dave,

a small fix for 2.6.12 if still possible: exp_next_seq() (used for
/proc/net/ip_conntracK_expect) doesn't advance the seq-file position.
I haven't tracked exactly why, but this makes the seq-file API show
(n+1)*(n/2) entries, with the first one showed n times, the second
one n-1 times, and so on.

Regards
Patrick

[-- Attachment #2: x --]
[-- Type: text/plain, Size: 876 bytes --]

[NETFILTER]: Advance seq-file position in exp_next_seq()

Signed-off-by: Patrick McHardy <kaber@trash.net>

---
commit 5cc89cae827217a8183d4eb1165cc32f804518fa
tree 7284df19ea5b31f63777407cec1adfd703fa7958
parent f268bb805a9777d5c82c7c1cb683b476d65f0c1b
author Patrick McHardy <kaber@trash.net> Sat, 11 Jun 2005 19:21:28 +0200
committer Patrick McHardy <kaber@trash.net> Sat, 11 Jun 2005 19:21:28 +0200

 net/ipv4/netfilter/ip_conntrack_standalone.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/net/ipv4/netfilter/ip_conntrack_standalone.c b/net/ipv4/netfilter/ip_conntrack_standalone.c
--- a/net/ipv4/netfilter/ip_conntrack_standalone.c
+++ b/net/ipv4/netfilter/ip_conntrack_standalone.c
@@ -256,6 +256,7 @@ static void *exp_seq_next(struct seq_fil
 {
  	struct list_head *e = v;
 
+	++*pos;
 	e = e->next;
 
 	if (e == &ip_conntrack_expect_list)

Re: [NETFILTER]: Advance seq-file position in exp_next_seq()

[David S. Miller]

From: Patrick McHardy <kaber@trash.net>
Date: Tue, 14 Jun 2005 02:56:37 +0200

> a small fix for 2.6.12 if still possible: exp_next_seq() (used for
> /proc/net/ip_conntracK_expect) doesn't advance the seq-file position.
> I haven't tracked exactly why, but this makes the seq-file API show
> (n+1)*(n/2) entries, with the first one showed n times, the second
> one n-1 times, and so on.

I put this into my tree and will try to get it to Linus tonight.

Re: [NETFILTER]: Advance seq-file position in exp_next_seq()

[Florian Weimer]

* Linux Kernel Mailing List:

> tree f33460f2f2452807483ba6453e3319dcfe4bf856
> parent 814d8ffd5009e13f1266759b583ef847c5350d77
> author Patrick McHardy <kaber@trash.net> Tue, 14 Jun 2005 08:27:13 -0700
> committer David S. Miller <davem@davemloft.net> Tue, 14 Jun 2005 08:27:13 -0700
>
> [NETFILTER]: Advance seq-file position in exp_next_seq()

Unfortunately, this still doesn't fix the "ip_ct_tcp: SEQ is over the
upper bound (over the window of the receiver)" regression some people
see since 2.6.9.  (It probably doesn't intent to, either, but I was
associating freely and arranged for a test.)