diff options
| author | Jakub Kicinski <[email protected]> | 2019-01-22 22:47:19 +0000 |
|---|---|---|
| committer | David S. Miller <[email protected]> | 2019-01-23 01:24:18 +0000 |
| commit | 1518039f6b5ac794313c24c76f85cead0cd60f6c (patch) | |
| tree | 1ade65e4d0b8b45670a7de1b0d045b6e7b3c509b | |
| parent | net: ip_gre: use erspan key field for tunnel lookup (diff) | |
| download | kernel-1518039f6b5ac794313c24c76f85cead0cd60f6c.tar.gz kernel-1518039f6b5ac794313c24c76f85cead0cd60f6c.zip | |
net/ipv6: don't return positive numbers when nothing was dumped
in6_dump_addrs() returns a positive 1 if there was nothing to dump.
This return value can not be passed as return from inet6_dump_addr()
as is, because it will confuse rtnetlink, resulting in NLMSG_DONE
never getting set:
$ ip addr list dev lo
EOF on netlink
Dump terminated
v2: flip condition to avoid a new goto (DaveA)
Fixes: 7c1e8a3817c5 ("netlink: fixup regression in RTM_GETADDR")
Reported-by: Brendan Galloway <[email protected]>
Signed-off-by: Jakub Kicinski <[email protected]>
Reviewed-by: David Ahern <[email protected]>
Tested-by: David Ahern <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
| -rw-r--r-- | net/ipv6/addrconf.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 93d5ad2b1a69..0c9e20ac01ab 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -5120,6 +5120,8 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb, if (idev) { err = in6_dump_addrs(idev, skb, cb, s_ip_idx, &fillargs); + if (err > 0) + err = 0; } goto put_tgt_net; } |