diff options
| author | Arthur Gautier <baloo@gandi.net> | 2018-12-31 02:10:58 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-01-04 12:47:06 -0800 |
| commit | 7c1e8a3817c55d73b27cc29b84075999c8894179 (patch) | |
| tree | ce97a9c897dba6c3ff7bdd93340cf4ba92b99064 /net/ipv4/devinet.c | |
| parent | 1492623e837fe7ca6296f7f5411328307e242771 (diff) | |
| download | linux-7c1e8a3817c55d73b27cc29b84075999c8894179.tar.gz linux-7c1e8a3817c55d73b27cc29b84075999c8894179.tar.bz2 linux-7c1e8a3817c55d73b27cc29b84075999c8894179.zip | |
netlink: fixup regression in RTM_GETADDR
This commit fixes a regression in AF_INET/RTM_GETADDR and
AF_INET6/RTM_GETADDR.
Before this commit, the kernel would stop dumping addresses once the first
skb was full and end the stream with NLMSG_DONE(-EMSGSIZE). The error
shouldn't be sent back to netlink_dump so the callback is kept alive. The
userspace is expected to call back with a new empty skb.
Changes from V1:
- The error is not handled in netlink_dump anymore but rather in
inet_dump_ifaddr and inet6_dump_addr directly as suggested by
David Ahern.
Fixes: d7e38611b81e ("net/ipv4: Put target net when address dump fails due to bad attributes")
Fixes: 242afaa6968c ("net/ipv6: Put target net when address dump fails due to bad attributes")
Cc: David Ahern <dsahern@gmail.com>
Cc: "David S . Miller" <davem@davemloft.net>
Cc: netdev@vger.kernel.org
Signed-off-by: Arthur Gautier <baloo@gandi.net>
Reviewed-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/devinet.c')
| -rw-r--r-- | net/ipv4/devinet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index 04ba321ae5ce..e258a00b4a3d 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c @@ -1826,7 +1826,7 @@ put_tgt_net: if (fillargs.netnsid >= 0) put_net(tgt_net); - return err < 0 ? err : skb->len; + return skb->len ? : err; } static void rtmsg_ifa(int event, struct in_ifaddr *ifa, struct nlmsghdr *nlh, |