net: ipmr: fix unresolved entry dumps

Nikolay Aleksandrov · davem330 · commit eddf016b9104 · 2018-10-17T22:35:42.000-07:00
If the skb space ends in an unresolved entry while dumping we'll miss some unresolved entries. The reason is due to zeroing the entry counter between dumping resolved and unresolved mfc entries. We should just keep counting until the whole table is dumped and zero when we move to the next as we have a separate table counter. Reported-by: Colin Ian King <colin.king@canonical.com> Fixes: 8fb472c ("ipmr: improve hash scalability") Signed-off-by: Nikolay Aleksandrov <nikolay@cumulusnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/net/ipv4/ipmr_base.c b/net/ipv4/ipmr_base.c
@@ -296,8 +296,6 @@ int mr_rtm_dumproute(struct sk_buff *skb, struct netlink_callback *cb,
 next_entry:
 			e++;
 		}
-		e = 0;
-		s_e = 0;
 
 		spin_lock_bh(lock);
 		list_for_each_entry(mfc, &mrt->mfc_unres_queue, list) {

Original file line number	Diff line number	Diff line change
`@@ -296,8 +296,6 @@ int mr_rtm_dumproute(struct sk_buff skb, struct netlink_callback cb,`
`296`	`296`	`next_entry:`
`297`	`297`	`e++;`
`298`	`298`	`}`
`299`		`- e = 0;`
`300`		`- s_e = 0;`
`301`	`299`
`302`	`300`	`spin_lock_bh(lock);`
`303`	`301`	`list_for_each_entry(mfc, &mrt->mfc_unres_queue, list) {`