Commit 59fe9b3f authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller
Browse files

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: default avatarIdo Schimmel <idosch@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 80bedf1a

drivers/net/ethernet/mellanox/mlxsw/spectrum.c

+7 −0
Original line number Diff line number Diff line
@@ -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;

	}