diff options
| author | David Ahern <dsahern@gmail.com> | 2018-10-19 10:00:19 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-10-20 15:43:14 -0700 |
| commit | 4ba4c566ba8448a05e6257e0b98a21f1a0d55315 (patch) | |
| tree | e594a4b9c9447bb6bc494994e5b9cfe655333ee7 | |
| parent | d55bef5059dd057bd077155375c581b49d25be7e (diff) | |
| download | linux-stable-4ba4c566ba8448a05e6257e0b98a21f1a0d55315.tar.gz linux-stable-4ba4c566ba8448a05e6257e0b98a21f1a0d55315.tar.bz2 linux-stable-4ba4c566ba8448a05e6257e0b98a21f1a0d55315.zip | |
net/ipv6: Fix index counter for unicast addresses in in6_dump_addrs
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: 502a2ffd7376a ("ipv6: convert idev_list to list macros")
Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/ipv6/addrconf.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index c63ccce6425f..4e81ff2f4588 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -4928,8 +4928,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, @@ -4938,6 +4938,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; } |