net/ipv6: Display all addresses in output of /proc/net/if_inet6

Jeff Barnhill · davem330 · commit 86f9bd1ff61c · 2018-09-21T19:10:49.000-07:00
The backend handling for /proc/net/if_inet6 in addrconf.c doesn't properly
handle starting/stopping the iteration.  The problem is that at some point
during the iteration, an overflow is detected and the process is
subsequently stopped.  The item being shown via seq_printf() when the
overflow occurs is not actually shown, though.  When start() is
subsequently called to resume iterating, it returns the next item, and
thus the item that was being processed when the overflow occurred never
gets printed.

Alter the meaning of the private data member "offset".  Currently, when it
is not 0 (which only happens at the very beginning), "offset" represents
the next hlist item to be printed.  After this change, "offset" always
represents the current item.

This is also consistent with the private data member "bucket", which
represents the current bucket, and also the use of "pos" as defined in
seq_file.txt:
    The pos passed to start() will always be either zero, or the most
    recent pos used in the previous session.

Signed-off-by: Jeff Barnhill &lt;0xeffeff@gmail.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
@@ -4201,7 +4201,6 @@ static struct inet6_ifaddr *if6_get_first(struct seq_file *seq, loff_t pos)
 				p++;
 				continue;
 			}
-			state->offset++;
 			return ifa;
 		}
 
@@ -4225,13 +4224,12 @@ static struct inet6_ifaddr *if6_get_next(struct seq_file *seq,
 		return ifa;
 	}
 
+	state->offset = 0;
 	while (++state->bucket < IN6_ADDR_HSIZE) {
-		state->offset = 0;
 		hlist_for_each_entry_rcu(ifa,
 				     &inet6_addr_lst[state->bucket], addr_lst) {
 			if (!net_eq(dev_net(ifa->idev->dev), net))
 				continue;
-			state->offset++;
 			return ifa;
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -4201,7 +4201,6 @@ static struct inet6_ifaddr if6_get_first(struct seq_file seq, loff_t pos)`
`4201`	`4201`	`p++;`
`4202`	`4202`	`continue;`
`4203`	`4203`	`}`
`4204`		`- state->offset++;`
`4205`	`4204`	`return ifa;`
`4206`	`4205`	`}`
`4207`	`4206`
`@@ -4225,13 +4224,12 @@ static struct inet6_ifaddr if6_get_next(struct seq_file seq,`
`4225`	`4224`	`return ifa;`
`4226`	`4225`	`}`
`4227`	`4226`
	`4227`	`+ state->offset = 0;`
`4228`	`4228`	`while (++state->bucket < IN6_ADDR_HSIZE) {`
`4229`		`- state->offset = 0;`
`4230`	`4229`	`hlist_for_each_entry_rcu(ifa,`
`4231`	`4230`	`&inet6_addr_lst[state->bucket], addr_lst) {`
`4232`	`4231`	`if (!net_eq(dev_net(ifa->idev->dev), net))`
`4233`	`4232`	`continue;`
`4234`		`- state->offset++;`
`4235`	`4233`	`return ifa;`
`4236`	`4234`	`}`
`4237`	`4235`	`}`