net/ipv6: Put target net when address dump fails due to bad attributes

If tgt_net is set based on IFA_TARGET_NETNSID attribute in the dump
request, make sure all error paths call put_net.

Fixes: 6371a71f3a3b ("net/ipv6: Add support for dumping addresses for a specific device")
Fixes: ed6eff11790a ("net/ipv6: Update inet6_dump_addr for strict data checking")
Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
index 45b84dd..7eb09c8 100644 (file)
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@ -5089,23 +5089,25 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
        struct net_device *dev;
        struct inet6_dev *idev;
        struct hlist_head *head;
+       int err = 0;
 
        s_h = cb->args[0];
        s_idx = idx = cb->args[1];
        s_ip_idx = cb->args[2];
 
        if (cb->strict_check) {
-               int err;
-
                err = inet6_valid_dump_ifaddr_req(nlh, &fillargs, &tgt_net,
                                                  skb->sk, cb);
                if (err < 0)
-                       return err;
+                       goto put_tgt_net;
 
+               err = 0;
                if (fillargs.ifindex) {
                        dev = __dev_get_by_index(tgt_net, fillargs.ifindex);
-                       if (!dev)
-                               return -ENODEV;
+                       if (!dev) {
+                               err = -ENODEV;
+                               goto put_tgt_net;
+                       }
                        idev = __in6_dev_get(dev);
                        if (idev) {
                                err = in6_dump_addrs(idev, skb, cb, s_ip_idx,
@@ -5144,7 +5146,7 @@ put_tgt_net:
        if (fillargs.netnsid >= 0)
                put_net(tgt_net);
 
-       return skb->len;
+       return err < 0 ? err : skb->len;
 }
 
 static int inet6_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)