1 files changed, 117 insertions, 65 deletions

diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 446cbaf81185..7ebed55b5f7d 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -50,6 +50,7 @@
 #include <net/arp.h>
 #include <net/route.h>
 #include <net/udp.h>
+#include <net/tcp.h>
 #include <net/sock.h>
 #include <net/pkt_sched.h>
 #include <net/fib_rules.h>
@@ -669,9 +670,19 @@ int rtnetlink_put_metrics(struct sk_buff *skb, u32 *metrics)
 
         for (i = 0; i < RTAX_MAX; i++) {
                 if (metrics[i]) {
+                        if (i == RTAX_CC_ALGO - 1) {
+                                char tmp[TCP_CA_NAME_MAX], *name;
+
+                                name = tcp_ca_get_name_by_key(metrics[i], tmp);
+                                if (!name)
+                                        continue;
+                                if (nla_put_string(skb, i + 1, name))
+                                        goto nla_put_failure;
+                        } else {
+                                if (nla_put_u32(skb, i + 1, metrics[i]))
+                                        goto nla_put_failure;
+                        }
                         valid++;
-                        if (nla_put_u32(skb, i+1, metrics[i]))
-                                goto nla_put_failure;
                 }
         }
 
@@ -864,6 +875,7 @@ static noinline size_t if_nlmsg_size(const struct net_device *dev,
                + nla_total_size(1) /* IFLA_OPERSTATE */
                + nla_total_size(1) /* IFLA_LINKMODE */
                + nla_total_size(4) /* IFLA_CARRIER_CHANGES */
+               + nla_total_size(4) /* IFLA_LINK_NETNSID */
                + nla_total_size(ext_filter_mask
                                 & RTEXT_FILTER_VF ? 4 : 0) /* IFLA_NUM_VF */
                + rtnl_vfinfo_size(dev, ext_filter_mask) /* IFLA_VFINFO_LIST */
@@ -1158,6 +1170,18 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
                         goto nla_put_failure;
         }
 
+        if (dev->rtnl_link_ops &&
+            dev->rtnl_link_ops->get_link_net) {
+                struct net *link_net = dev->rtnl_link_ops->get_link_net(dev);
+
+                if (!net_eq(dev_net(dev), link_net)) {
+                        int id = peernet2id(dev_net(dev), link_net);
+
+                        if (nla_put_s32(skb, IFLA_LINK_NETNSID, id))
+                                goto nla_put_failure;
+                }
+        }
+
         if (!(af_spec = nla_nest_start(skb, IFLA_AF_SPEC)))
                 goto nla_put_failure;
 
@@ -1188,7 +1212,8 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
 
         nla_nest_end(skb, af_spec);
 
-        return nlmsg_end(skb, nlh);
+        nlmsg_end(skb, nlh);
+        return 0;
 
 nla_put_failure:
         nlmsg_cancel(skb, nlh);
@@ -1223,6 +1248,7 @@ static const struct nla_policy ifla_policy[IFLA_MAX+1] = {
         [IFLA_PHYS_PORT_ID]     = { .type = NLA_BINARY, .len = MAX_PHYS_ITEM_ID_LEN },
         [IFLA_CARRIER_CHANGES]  = { .type = NLA_U32 },  /* ignored */
         [IFLA_PHYS_SWITCH_ID]   = { .type = NLA_BINARY, .len = MAX_PHYS_ITEM_ID_LEN },
+        [IFLA_LINK_NETNSID]     = { .type = NLA_S32 },
 };
 
 static const struct nla_policy ifla_info_policy[IFLA_INFO_MAX+1] = {
@@ -1237,18 +1263,12 @@ static const struct nla_policy ifla_vfinfo_policy[IFLA_VF_INFO_MAX+1] = {
 };
 
 static const struct nla_policy ifla_vf_policy[IFLA_VF_MAX+1] = {
-        [IFLA_VF_MAC]           = { .type = NLA_BINARY,
-                                    .len = sizeof(struct ifla_vf_mac) },
-        [IFLA_VF_VLAN]          = { .type = NLA_BINARY,
-                                    .len = sizeof(struct ifla_vf_vlan) },
-        [IFLA_VF_TX_RATE]       = { .type = NLA_BINARY,
-                                    .len = sizeof(struct ifla_vf_tx_rate) },
-        [IFLA_VF_SPOOFCHK]      = { .type = NLA_BINARY,
-                                    .len = sizeof(struct ifla_vf_spoofchk) },
-        [IFLA_VF_RATE]          = { .type = NLA_BINARY,
-                                    .len = sizeof(struct ifla_vf_rate) },
-        [IFLA_VF_LINK_STATE]    = { .type = NLA_BINARY,
-                                    .len = sizeof(struct ifla_vf_link_state) },
+        [IFLA_VF_MAC]           = { .len = sizeof(struct ifla_vf_mac) },
+        [IFLA_VF_VLAN]          = { .len = sizeof(struct ifla_vf_vlan) },
+        [IFLA_VF_TX_RATE]       = { .len = sizeof(struct ifla_vf_tx_rate) },
+        [IFLA_VF_SPOOFCHK]      = { .len = sizeof(struct ifla_vf_spoofchk) },
+        [IFLA_VF_RATE]          = { .len = sizeof(struct ifla_vf_rate) },
+        [IFLA_VF_LINK_STATE]    = { .len = sizeof(struct ifla_vf_link_state) },
 };
 
 static const struct nla_policy ifla_port_policy[IFLA_PORT_MAX+1] = {
@@ -1280,7 +1300,6 @@ static int rtnl_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb)
         s_h = cb->args[0];
         s_idx = cb->args[1];
 
-        rcu_read_lock();
         cb->seq = net->dev_base_seq;
 
         /* A hack to preserve kernel<->userspace interface.
@@ -1302,7 +1321,7 @@ static int rtnl_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb)
         for (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) {
                 idx = 0;
                 head = &net->dev_index_head[h];
-                hlist_for_each_entry_rcu(dev, head, index_hlist) {
+                hlist_for_each_entry(dev, head, index_hlist) {
                         if (idx < s_idx)
                                 goto cont;
                         err = rtnl_fill_ifinfo(skb, dev, RTM_NEWLINK,
@@ -1315,7 +1334,7 @@ static int rtnl_dump_ifinfo(struct sk_buff *skb, struct netlink_callback *cb)
                          */
                         WARN_ON((err == -EMSGSIZE) && (skb->len == 0));
 
-                        if (err <= 0)
+                        if (err < 0)
                                 goto out;
 
                         nl_dump_check_consistent(cb, nlmsg_hdr(skb));
@@ -1324,7 +1343,6 @@ cont:
                 }
         }
 out:
-        rcu_read_unlock();
         cb->args[1] = idx;
         cb->args[0] = h;
 
@@ -1914,10 +1932,10 @@ static int rtnl_group_changelink(const struct sk_buff *skb,
                 struct ifinfomsg *ifm,
                 struct nlattr **tb)
 {
-        struct net_device *dev;
+        struct net_device *dev, *aux;
         int err;
 
-        for_each_netdev(net, dev) {
+        for_each_netdev_safe(net, dev, aux) {
                 if (dev->group == group) {
                         err = do_setlink(skb, dev, ifm, tb, NULL, 0);
                         if (err < 0)
@@ -1992,11 +2010,11 @@ replay:
         }
 
         if (1) {
-                struct nlattr *attr[ops ? ops->maxtype + 1 : 0];
-                struct nlattr *slave_attr[m_ops ? m_ops->slave_maxtype + 1 : 0];
+                struct nlattr *attr[ops ? ops->maxtype + 1 : 1];
+                struct nlattr *slave_attr[m_ops ? m_ops->slave_maxtype + 1 : 1];
                 struct nlattr **data = NULL;
                 struct nlattr **slave_data = NULL;
-                struct net *dest_net;
+                struct net *dest_net, *link_net = NULL;
 
                 if (ops) {
                         if (ops->maxtype && linkinfo[IFLA_INFO_DATA]) {
@@ -2102,7 +2120,25 @@ replay:
                 if (IS_ERR(dest_net))
                         return PTR_ERR(dest_net);
 
-                dev = rtnl_create_link(dest_net, ifname, name_assign_type, ops, tb);
+                err = -EPERM;
+                if (!netlink_ns_capable(skb, dest_net->user_ns, CAP_NET_ADMIN))
+                        goto out;
+
+                if (tb[IFLA_LINK_NETNSID]) {
+                        int id = nla_get_s32(tb[IFLA_LINK_NETNSID]);
+
+                        link_net = get_net_ns_by_id(dest_net, id);
+                        if (!link_net) {
+                                err =  -EINVAL;
+                                goto out;
+                        }
+                        err = -EPERM;
+                        if (!netlink_ns_capable(skb, link_net->user_ns, CAP_NET_ADMIN))
+                                goto out;
+                }
+
+                dev = rtnl_create_link(link_net ? : dest_net, ifname,
+                                       name_assign_type, ops, tb);
                 if (IS_ERR(dev)) {
                         err = PTR_ERR(dev);
                         goto out;
@@ -2111,7 +2147,7 @@ replay:
                 dev->ifindex = ifm->ifi_index;
 
                 if (ops->newlink) {
-                        err = ops->newlink(net, dev, tb, data);
+                        err = ops->newlink(link_net ? : net, dev, tb, data);
                         /* Drivers should call free_netdev() in ->destructor
                          * and unregister it on failure after registration
                          * so that device could be finally freed in rtnl_unlock.
@@ -2131,10 +2167,27 @@ replay:
                 }
                 err = rtnl_configure_link(dev, ifm);
                 if (err < 0)
-                        unregister_netdevice(dev);
+                        goto out_unregister;
+                if (link_net) {
+                        err = dev_change_net_namespace(dev, dest_net, ifname);
+                        if (err < 0)
+                                goto out_unregister;
+                }
 out:
+                if (link_net)
+                        put_net(link_net);
                 put_net(dest_net);
                 return err;
+out_unregister:
+                if (ops->newlink) {
+                        LIST_HEAD(list_kill);
+
+                        ops->dellink(dev, &list_kill);
+                        unregister_netdevice_many(&list_kill);
+                } else {
+                        unregister_netdevice(dev);
+                }
+                goto out;
         }
 }
 
@@ -2315,7 +2368,8 @@ static int nlmsg_populate_fdb_fill(struct sk_buff *skb,
         if (nla_put(skb, NDA_LLADDR, ETH_ALEN, addr))
                 goto nla_put_failure;
 
-        return nlmsg_end(skb, nlh);
+        nlmsg_end(skb, nlh);
+        return 0;
 
 nla_put_failure:
         nlmsg_cancel(skb, nlh);
@@ -2698,10 +2752,11 @@ static int rtnl_fdb_dump(struct sk_buff *skb, struct netlink_callback *cb)
                                                          idx);
                 }
 
-                idx = ndo_dflt_fdb_dump(skb, cb, dev, NULL, idx);
                 if (dev->netdev_ops->ndo_fdb_dump)
-                        idx = dev->netdev_ops->ndo_fdb_dump(skb, cb, bdev, dev,
+                        idx = dev->netdev_ops->ndo_fdb_dump(skb, cb, dev, NULL,
                                                             idx);
+                else
+                        idx = ndo_dflt_fdb_dump(skb, cb, dev, NULL, idx);
 
                 cops = NULL;
         }
@@ -2797,7 +2852,8 @@ int ndo_dflt_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
 
         nla_nest_end(skb, protinfo);
 
-        return nlmsg_end(skb, nlh);
+        nlmsg_end(skb, nlh);
+        return 0;
 nla_put_failure:
         nlmsg_cancel(skb, nlh);
         return -EMSGSIZE;
@@ -2868,32 +2924,24 @@ static inline size_t bridge_nlmsg_size(void)
                 + nla_total_size(sizeof(u16));  /* IFLA_BRIDGE_MODE */
 }
 
-static int rtnl_bridge_notify(struct net_device *dev, u16 flags)
+static int rtnl_bridge_notify(struct net_device *dev)
 {
         struct net *net = dev_net(dev);
-        struct net_device *br_dev = netdev_master_upper_dev_get(dev);
         struct sk_buff *skb;
         int err = -EOPNOTSUPP;
 
+        if (!dev->netdev_ops->ndo_bridge_getlink)
+                return 0;
+
         skb = nlmsg_new(bridge_nlmsg_size(), GFP_ATOMIC);
         if (!skb) {
                 err = -ENOMEM;
                 goto errout;
         }
 
-        if ((!flags || (flags & BRIDGE_FLAGS_MASTER)) &&
-            br_dev && br_dev->netdev_ops->ndo_bridge_getlink) {
-                err = br_dev->netdev_ops->ndo_bridge_getlink(skb, 0, 0, dev, 0);
-                if (err < 0)
-                        goto errout;
-        }
-
-        if ((flags & BRIDGE_FLAGS_SELF) &&
-            dev->netdev_ops->ndo_bridge_getlink) {
-                err = dev->netdev_ops->ndo_bridge_getlink(skb, 0, 0, dev, 0);
-                if (err < 0)
-                        goto errout;
-        }
+        err = dev->netdev_ops->ndo_bridge_getlink(skb, 0, 0, dev, 0);
+        if (err < 0)
+                goto errout;
 
         if (!skb->len)
                 goto errout;
@@ -2915,7 +2963,7 @@ static int rtnl_bridge_setlink(struct sk_buff *skb, struct nlmsghdr *nlh)
         struct net_device *dev;
         struct nlattr *br_spec, *attr = NULL;
         int rem, err = -EOPNOTSUPP;
-        u16 oflags, flags = 0;
+        u16 flags = 0;
         bool have_flags = false;
 
         if (nlmsg_len(nlh) < sizeof(*ifm))
@@ -2945,8 +2993,6 @@ static int rtnl_bridge_setlink(struct sk_buff *skb, struct nlmsghdr *nlh)
                 }
         }
 
-        oflags = flags;
-
         if (!flags || (flags & BRIDGE_FLAGS_MASTER)) {
                 struct net_device *br_dev = netdev_master_upper_dev_get(dev);
 
@@ -2955,7 +3001,7 @@ static int rtnl_bridge_setlink(struct sk_buff *skb, struct nlmsghdr *nlh)
                         goto out;
                 }
 
-                err = br_dev->netdev_ops->ndo_bridge_setlink(dev, nlh);
+                err = br_dev->netdev_ops->ndo_bridge_setlink(dev, nlh, flags);
                 if (err)
                         goto out;
 
@@ -2966,17 +3012,20 @@ static int rtnl_bridge_setlink(struct sk_buff *skb, struct nlmsghdr *nlh)
                 if (!dev->netdev_ops->ndo_bridge_setlink)
                         err = -EOPNOTSUPP;
                 else
-                        err = dev->netdev_ops->ndo_bridge_setlink(dev, nlh);
-
-                if (!err)
+                        err = dev->netdev_ops->ndo_bridge_setlink(dev, nlh,
+                                                                  flags);
+                if (!err) {
                         flags &= ~BRIDGE_FLAGS_SELF;
+
+                        /* Generate event to notify upper layer of bridge
+                         * change
+                         */
+                        err = rtnl_bridge_notify(dev);
+                }
         }
 
         if (have_flags)
                 memcpy(nla_data(attr), &flags, sizeof(flags));
-        /* Generate event to notify upper layer of bridge change */
-        if (!err)
-                err = rtnl_bridge_notify(dev, oflags);
 out:
         return err;
 }
@@ -2988,7 +3037,7 @@ static int rtnl_bridge_dellink(struct sk_buff *skb, struct nlmsghdr *nlh)
         struct net_device *dev;
         struct nlattr *br_spec, *attr = NULL;
         int rem, err = -EOPNOTSUPP;
-        u16 oflags, flags = 0;
+        u16 flags = 0;
         bool have_flags = false;
 
         if (nlmsg_len(nlh) < sizeof(*ifm))
@@ -3018,8 +3067,6 @@ static int rtnl_bridge_dellink(struct sk_buff *skb, struct nlmsghdr *nlh)
                 }
         }
 
-        oflags = flags;
-
         if (!flags || (flags & BRIDGE_FLAGS_MASTER)) {
                 struct net_device *br_dev = netdev_master_upper_dev_get(dev);
 
@@ -3028,7 +3075,7 @@ static int rtnl_bridge_dellink(struct sk_buff *skb, struct nlmsghdr *nlh)
                         goto out;
                 }
 
-                err = br_dev->netdev_ops->ndo_bridge_dellink(dev, nlh);
+                err = br_dev->netdev_ops->ndo_bridge_dellink(dev, nlh, flags);
                 if (err)
                         goto out;
 
@@ -3039,17 +3086,21 @@ static int rtnl_bridge_dellink(struct sk_buff *skb, struct nlmsghdr *nlh)
                 if (!dev->netdev_ops->ndo_bridge_dellink)
                         err = -EOPNOTSUPP;
                 else
-                        err = dev->netdev_ops->ndo_bridge_dellink(dev, nlh);
+                        err = dev->netdev_ops->ndo_bridge_dellink(dev, nlh,
+                                                                  flags);
 
-                if (!err)
+                if (!err) {
                         flags &= ~BRIDGE_FLAGS_SELF;
+
+                        /* Generate event to notify upper layer of bridge
+                         * change
+                         */
+                        err = rtnl_bridge_notify(dev);
+                }
         }
 
         if (have_flags)
                 memcpy(nla_data(attr), &flags, sizeof(flags));
-        /* Generate event to notify upper layer of bridge change */
-        if (!err)
-                err = rtnl_bridge_notify(dev, oflags);
 out:
         return err;
 }
@@ -3139,6 +3190,7 @@ static int rtnetlink_event(struct notifier_block *this, unsigned long event, voi
         case NETDEV_UNREGISTER_FINAL:
         case NETDEV_RELEASE:
         case NETDEV_JOIN:
+        case NETDEV_BONDING_INFO:
                 break;
         default:
                 rtmsg_ifinfo(RTM_NEWLINK, dev, 0, GFP_KERNEL);