Commit 7fcd1e03 authored May 02, 2019 by David Ahern Committed by David S. Miller May 04, 2019

ipmr_base: Do not reset index in mr_table_dump



e is the counter used to save the location of a dump when an
skb is filled. Once the walk of the table is complete, mr_table_dump
needs to return without resetting that index to 0. Dump of a specific
table is looping because of the reset because there is no way to
indicate the walk of the table is done.

Move the reset to the caller so the dump of each table starts at 0,
but the loop counter is maintained if a dump fills an skb.

Fixes: e1cedae1 ("ipmr: Refactor mr_rtm_dumproute")
Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 25426043

net/ipv4/ipmr_base.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -335,8 +335,6 @@ next_entry2:
		}
		spin_unlock_bh(lock);
		err = 0;
		e = 0;

		out:
		cb->args[1] = e;
		return err;
		@@ -374,6 +372,7 @@ int mr_rtm_dumproute(struct sk_buff skb, struct netlink_callback cb,
		err = mr_table_dump(mrt, skb, cb, fill, lock, filter);
		if (err < 0)
		break;
		cb->args[1] = 0;
		next_table:
		t++;
		}

Admin message