* [patch 6/6] neighbour.c, pneigh_get_next() skips published entry
@ 2006-06-25 8:47 akpm
2006-06-25 14:47 ` Herbert Xu
0 siblings, 1 reply; 2+ messages in thread
From: akpm @ 2006-06-25 8:47 UTC (permalink / raw)
To: davem; +Cc: netdev, akpm, Jari.Takkala, jari.takkala
From: "Jari Takkala" <Jari.Takkala@Q9.com>
Fix a problem where output from /proc/net/arp skips a record when the full
output does not fit into the users read() buffer.
To reproduce: publish a large number of ARP entries (more than 10 required
on my system). Run 'dd if=/proc/net/arp of=arp-1024.out bs=1024'. View
the output, one entry will be missing.
Signed-off-by: Jari Takkala <jari.takkala@q9.com>
[akpm: submitted before, discussion ended inconclusively, iirc]
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
net/core/neighbour.c | 6 ++++++
1 file changed, 6 insertions(+)
diff -puN net/core/neighbour.c~neighbourc-pneigh_get_next-skips-published-entry net/core/neighbour.c
--- a/net/core/neighbour.c~neighbourc-pneigh_get_next-skips-published-entry
+++ a/net/core/neighbour.c
@@ -2138,6 +2138,12 @@ static struct pneigh_entry *pneigh_get_n
struct neigh_seq_state *state = seq->private;
struct neigh_table *tbl = state->tbl;
+ if (pos != NULL && *pos == 1 &&
+ (pn->next || tbl->phash_buckets[state->bucket])) {
+ --(*pos);
+ return pn;
+ }
+
pn = pn->next;
while (!pn) {
if (++state->bucket > PNEIGH_HASHMASK)
_
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [patch 6/6] neighbour.c, pneigh_get_next() skips published entry
2006-06-25 8:47 [patch 6/6] neighbour.c, pneigh_get_next() skips published entry akpm
@ 2006-06-25 14:47 ` Herbert Xu
0 siblings, 0 replies; 2+ messages in thread
From: Herbert Xu @ 2006-06-25 14:47 UTC (permalink / raw)
To: akpm; +Cc: davem, netdev, akpm, Jari.Takkala
akpm@osdl.org wrote:
>
> [akpm: submitted before, discussion ended inconclusively, iirc]
> Signed-off-by: Andrew Morton <akpm@osdl.org>
I still need to try to reproduce this. I might be able to allocate some
time on this soon.
Cheers,
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2006-06-25 14:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-06-25 8:47 [patch 6/6] neighbour.c, pneigh_get_next() skips published entry akpm
2006-06-25 14:47 ` Herbert Xu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.