ipv6: Fix dump of specific table with strict checking

dsahern · davem330 · commit 73155879b3c1 · 2019-01-02T20:15:43.000-08:00
Dump of a specific table with strict checking enabled is looping. The problem is that the end of the table dump is not marked in the cb. When dumping a specific table, cb args 0 and 1 are not used (they are the hash index and entry with an hash table index when dumping all tables). Re-use args[0] to hold a 'done' flag for the specific table dump. Fixes: 13e3890 ("net/ipv6: Plumb support for filtering route dumps") Reported-by: Jakub Kicinski <jakub.kicinski@netronome.com> Signed-off-by: David Ahern <dsahern@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
@@ -627,7 +627,11 @@ static int inet6_dump_fib(struct sk_buff *skb, struct netlink_callback *cb)
 			return -ENOENT;
 		}
 
-		res = fib6_dump_table(tb, skb, cb);
+		if (!cb->args[0]) {
+			res = fib6_dump_table(tb, skb, cb);
+			if (!res)
+				cb->args[0] = 1;
+		}
 		goto out;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -627,7 +627,11 @@ static int inet6_dump_fib(struct sk_buff skb, struct netlink_callback cb)`
`627`	`627`	`return -ENOENT;`
`628`	`628`	`}`
`629`	`629`
`630`		`- res = fib6_dump_table(tb, skb, cb);`
	`630`	`+ if (!cb->args[0]) {`
	`631`	`+ res = fib6_dump_table(tb, skb, cb);`
	`632`	`+ if (!res)`
	`633`	`+ cb->args[0] = 1;`
	`634`	`+ }`
`631`	`635`	`goto out;`
`632`	`636`	`}`
`633`	`637`