mlxsw: spectrum: Sanitize port netdev upper devices

We currently only support the following upper devices for port netdevs:
1) Bridge
2) LAG (bond / team)
3) VLAN

Any other device is forbidden, so return an error.

Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
index 3d570086527e69cc993d57a48695d07116d77d97..b47e3fb48bf76ba6f1f568b6d3e13cc4741086eb 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -3034,6 +3034,10 @@ static int mlxsw_sp_netdevice_port_upper_event(struct net_device *dev,
        switch (event) {
        case NETDEV_PRECHANGEUPPER:
                upper_dev = info->upper_dev;
+               if (!is_vlan_dev(upper_dev) &&
+                   !netif_is_lag_master(upper_dev) &&
+                   !netif_is_bridge_master(upper_dev))
+                       return -EINVAL;
                if (!info->master || !info->linking)
                        break;
                /* HW limitation forbids to put ports to multiple bridges. */
@@ -3070,6 +3074,9 @@ static int mlxsw_sp_netdevice_port_upper_event(struct net_device *dev,
                        else
                                err = mlxsw_sp_port_lag_leave(mlxsw_sp_port,
                                                              upper_dev);
+               } else {
+                       err = -EINVAL;
+                       WARN_ON(1);
                }
                break;
        }