diff options
| author |   Alexey Kodanev <alexey.kodanev@oracle.com> | 2018-11-02 19:11:05 +0300 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-11-05 17:04:54 -0800 |
| commit | e22d0bfa09a56e427a1a950ccb85621c86b343a4 (patch) | |
| tree | db6fc39d9dd7c916a3fe6dcd468c3b3820960645 /net | |
| parent | rtnetlink: restore handling of dumpit return value in rtnl_dump_all() (diff) | |
| download | linux-dev-e22d0bfa09a56e427a1a950ccb85621c86b343a4.tar.xz linux-dev-e22d0bfa09a56e427a1a950ccb85621c86b343a4.zip | |
ipv6: properly check return value in inet6_dump_all()
Make sure we call fib6_dump_end() if it happens that skb->len
is zero. rtnl_dump_all() can reset cb->args on the next loop
iteration there.
Fixes: 08e814c9e8eb ("net/ipv6: Bail early if user only wants cloned entries")
Fixes: ae677bbb4441 ("net: Don't return invalid table id error when dumping all families")
Signed-off-by: Alexey Kodanev <alexey.kodanev@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/ip6_fib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c index 1b8bc008b53b..ae3786132c23 100644 --- a/net/ipv6/ip6_fib.c +++ b/net/ipv6/ip6_fib.c @@ -591,7 +591,7 @@ static int inet6_dump_fib(struct sk_buff *skb, struct netlink_callback *cb) /* fib entries are never clones */ if (arg.filter.flags & RTM_F_CLONED) - return skb->len; + goto out; w = (void *)cb->args[2]; if (!w) { @@ -621,7 +621,7 @@ static int inet6_dump_fib(struct sk_buff *skb, struct netlink_callback *cb) tb = fib6_get_table(net, arg.filter.table_id); if (!tb) { if (arg.filter.dump_all_families) - return skb->len; + goto out; NL_SET_ERR_MSG_MOD(cb->extack, "FIB table does not exist"); return -ENOENT; |