| Message ID | 1541175065-25931-2-git-send-email-alexey.kodanev@oracle.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net,v2,1/2] rtnetlink: restore handling of dumpit return value in rtnl_dump_all() | expand |
From: Alexey Kodanev <alexey.kodanev@oracle.com> Date: Fri, 2 Nov 2018 19:11:05 +0300 > 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> Applied.
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c index 1b8bc00..ae37861 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;
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> --- v2: a new patch in v2 net/ipv6/ip6_fib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)