Commit 1c265854 authored Apr 24, 2014 by Kumar Sundararajan Committed by David S. Miller Apr 24, 2014

ipv6: fib: fix fib dump restart



When the ipv6 fib changes during a table dump, the walk is
restarted and the number of nodes dumped are skipped. But the existing
code doesn't advance to the next node after a node is skipped. This can
cause the dump to loop or produce lots of duplicates when the fib
is modified during the dump.

This change advances the walk to the next node if the current node is
skipped after a restart.

Signed-off-by: Kumar Sundararajan <kumar@fb.com>
Signed-off-by: Chris Mason <clm@fb.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent fc5e8835

net/ipv6/ip6_fib.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1459,7 +1459,7 @@ static int fib6_walk_continue(struct fib6_walker_t *w)

	if (w->skip) {		if (w->skip) {
	w->skip--;		w->skip--;
	continue;		goto skip;
	}		}

	err = w->func(w);		err = w->func(w);
	@@ -1469,6 +1469,7 @@ static int fib6_walk_continue(struct fib6_walker_t *w)
	w->count++;		w->count++;
	continue;		continue;
	}		}
			skip:
	w->state = FWS_U;		w->state = FWS_U;
	case FWS_U:		case FWS_U:
	if (fn == w->root)		if (fn == w->root)

Admin message