mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-07 19:30:30 +09:00
net/ipv6: Fix index counter for unicast addresses in in6_dump_addrs
[ Upstream commit4ba4c566ba] The loop wants to skip previously dumped addresses, so loops until current index >= saved index. If the message fills it wants to save the index for the next address to dump - ie., the one that did not fit in the current message. Currently, it is incrementing the index counter before comparing to the saved index, and then the saved index is off by 1 - it assumes the current address is going to fit in the message. Change the index handling to increment only after a succesful dump. Fixes:502a2ffd73("ipv6: convert idev_list to list macros") Signed-off-by: David Ahern <dsahern@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
2647feb650
commit
97749034bd
@@ -4439,8 +4439,8 @@ static int in6_dump_addrs(struct inet6_dev *idev, struct sk_buff *skb,
|
||||
|
||||
/* unicast address incl. temp addr */
|
||||
list_for_each_entry(ifa, &idev->addr_list, if_list) {
|
||||
if (++ip_idx < s_ip_idx)
|
||||
continue;
|
||||
if (ip_idx < s_ip_idx)
|
||||
goto next;
|
||||
err = inet6_fill_ifaddr(skb, ifa,
|
||||
NETLINK_CB(cb->skb).portid,
|
||||
cb->nlh->nlmsg_seq,
|
||||
@@ -4449,6 +4449,8 @@ static int in6_dump_addrs(struct inet6_dev *idev, struct sk_buff *skb,
|
||||
if (err < 0)
|
||||
break;
|
||||
nl_dump_check_consistent(cb, nlmsg_hdr(skb));
|
||||
next:
|
||||
ip_idx++;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user