net: dsa: avoid suspicious RCU usage for synced VLAN-aware MAC addresses

[linux-2.6-microblaze.git] / net / dsa / slave.c

diff --git a/net/dsa/slave.c b/net/dsa/slave.c
index 165bb2c..527b1d5 100644 (file)
--- a/net/dsa/slave.c
+++ b/net/dsa/slave.c
@@ -27,6 +27,7 @@
 #include "master.h"
 #include "netlink.h"
 #include "slave.h"
+#include "switch.h"
 #include "tag.h"
 
 struct dsa_switchdev_event_work {
@@ -161,8 +162,7 @@ static int dsa_slave_schedule_standalone_work(struct net_device *dev,
        return 0;
 }
 
-static int dsa_slave_host_vlan_rx_filtering(struct net_device *vdev, int vid,
-                                           void *arg)
+static int dsa_slave_host_vlan_rx_filtering(void *arg, int vid)
 {
        struct dsa_host_vlan_rx_filtering_ctx *ctx = arg;
 
@@ -170,6 +170,28 @@ static int dsa_slave_host_vlan_rx_filtering(struct net_device *vdev, int vid,
                                                  ctx->addr, vid);
 }
 
+static int dsa_slave_vlan_for_each(struct net_device *dev,
+                                  int (*cb)(void *arg, int vid), void *arg)
+{
+       struct dsa_port *dp = dsa_slave_to_port(dev);
+       struct dsa_vlan *v;
+       int err;
+
+       lockdep_assert_held(&dev->addr_list_lock);
+
+       err = cb(arg, 0);
+       if (err)
+               return err;
+
+       list_for_each_entry(v, &dp->user_vlans, list) {
+               err = cb(arg, v->vid);
+               if (err)
+                       return err;
+       }
+
+       return 0;
+}
+
 static int dsa_slave_sync_uc(struct net_device *dev,
                             const unsigned char *addr)
 {
@@ -180,18 +202,14 @@ static int dsa_slave_sync_uc(struct net_device *dev,
                .addr = addr,
                .event = DSA_UC_ADD,
        };
-       int err;
 
        dev_uc_add(master, addr);
 
        if (!dsa_switch_supports_uc_filtering(dp->ds))
                return 0;
 
-       err = dsa_slave_schedule_standalone_work(dev, DSA_UC_ADD, addr, 0);
-       if (err)
-               return err;
-
-       return vlan_for_each(dev, dsa_slave_host_vlan_rx_filtering, &ctx);
+       return dsa_slave_vlan_for_each(dev, dsa_slave_host_vlan_rx_filtering,
+                                      &ctx);
 }
 
 static int dsa_slave_unsync_uc(struct net_device *dev,
@@ -204,18 +222,14 @@ static int dsa_slave_unsync_uc(struct net_device *dev,
                .addr = addr,
                .event = DSA_UC_DEL,
        };
-       int err;
 
        dev_uc_del(master, addr);
 
        if (!dsa_switch_supports_uc_filtering(dp->ds))
                return 0;
 
-       err = dsa_slave_schedule_standalone_work(dev, DSA_UC_DEL, addr, 0);
-       if (err)
-               return err;
-
-       return vlan_for_each(dev, dsa_slave_host_vlan_rx_filtering, &ctx);
+       return dsa_slave_vlan_for_each(dev, dsa_slave_host_vlan_rx_filtering,
+                                      &ctx);
 }
 
 static int dsa_slave_sync_mc(struct net_device *dev,
@@ -228,18 +242,14 @@ static int dsa_slave_sync_mc(struct net_device *dev,
                .addr = addr,
                .event = DSA_MC_ADD,
        };
-       int err;
 
        dev_mc_add(master, addr);
 
        if (!dsa_switch_supports_mc_filtering(dp->ds))
                return 0;
 
-       err = dsa_slave_schedule_standalone_work(dev, DSA_MC_ADD, addr, 0);
-       if (err)
-               return err;
-
-       return vlan_for_each(dev, dsa_slave_host_vlan_rx_filtering, &ctx);
+       return dsa_slave_vlan_for_each(dev, dsa_slave_host_vlan_rx_filtering,
+                                      &ctx);
 }
 
 static int dsa_slave_unsync_mc(struct net_device *dev,
@@ -252,18 +262,14 @@ static int dsa_slave_unsync_mc(struct net_device *dev,
                .addr = addr,
                .event = DSA_MC_DEL,
        };
-       int err;
 
        dev_mc_del(master, addr);
 
        if (!dsa_switch_supports_mc_filtering(dp->ds))
                return 0;
 
-       err = dsa_slave_schedule_standalone_work(dev, DSA_MC_DEL, addr, 0);
-       if (err)
-               return err;
-
-       return vlan_for_each(dev, dsa_slave_host_vlan_rx_filtering, &ctx);
+       return dsa_slave_vlan_for_each(dev, dsa_slave_host_vlan_rx_filtering,
+                                      &ctx);
 }
 
 void dsa_slave_sync_ha(struct net_device *dev)
@@ -1759,6 +1765,7 @@ static int dsa_slave_vlan_rx_add_vid(struct net_device *dev, __be16 proto,
        struct netlink_ext_ack extack = {0};
        struct dsa_switch *ds = dp->ds;
        struct netdev_hw_addr *ha;
+       struct dsa_vlan *v;
        int ret;
 
        /* User port... */
@@ -1782,8 +1789,17 @@ static int dsa_slave_vlan_rx_add_vid(struct net_device *dev, __be16 proto,
            !dsa_switch_supports_mc_filtering(ds))
                return 0;
 
+       v = kzalloc(sizeof(*v), GFP_KERNEL);
+       if (!v) {
+               ret = -ENOMEM;
+               goto rollback;
+       }
+
        netif_addr_lock_bh(dev);
 
+       v->vid = vid;
+       list_add_tail(&v->list, &dp->user_vlans);
+
        if (dsa_switch_supports_mc_filtering(ds)) {
                netdev_for_each_synced_mc_addr(ha, dev) {
                        dsa_slave_schedule_standalone_work(dev, DSA_MC_ADD,
@@ -1803,6 +1819,12 @@ static int dsa_slave_vlan_rx_add_vid(struct net_device *dev, __be16 proto,
        dsa_flush_workqueue();
 
        return 0;
+
+rollback:
+       dsa_port_host_vlan_del(dp, &vlan);
+       dsa_port_vlan_del(dp, &vlan);
+
+       return ret;
 }
 
 static int dsa_slave_vlan_rx_kill_vid(struct net_device *dev, __be16 proto,
@@ -1816,6 +1838,7 @@ static int dsa_slave_vlan_rx_kill_vid(struct net_device *dev, __be16 proto,
        };
        struct dsa_switch *ds = dp->ds;
        struct netdev_hw_addr *ha;
+       struct dsa_vlan *v;
        int err;
 
        err = dsa_port_vlan_del(dp, &vlan);
@@ -1832,6 +1855,15 @@ static int dsa_slave_vlan_rx_kill_vid(struct net_device *dev, __be16 proto,
 
        netif_addr_lock_bh(dev);
 
+       v = dsa_vlan_find(&dp->user_vlans, &vlan);
+       if (!v) {
+               netif_addr_unlock_bh(dev);
+               return -ENOENT;
+       }
+
+       list_del(&v->list);
+       kfree(v);
+
        if (dsa_switch_supports_mc_filtering(ds)) {
                netdev_for_each_synced_mc_addr(ha, dev) {
                        dsa_slave_schedule_standalone_work(dev, DSA_MC_DEL,