Skip to content

Commit 74bc993

Browse files
pmachatadavem330
authored andcommitted
mlxsw: spectrum_router: Veto unsupported RIF MAC addresses
On NETDEV_PRE_CHANGEADDR, if the change is related to a RIF interface, verify that it satisfies the criterion that all RIF interfaces have the same MAC address prefix, as indicated by mlxsw_sp.mac_mask. Additionally, besides explicit address changes, check that the address of an interface for which a RIF is about to be added matches the required pattern as well. Signed-off-by: Petr Machata <[email protected]> Acked-by: Jiri Pirko <[email protected]> Reviewed-by: Ido Schimmel <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 9329b81 commit 74bc993

File tree

2 files changed

+52
-1
lines changed

2 files changed

+52
-1
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5334,7 +5334,9 @@ static int mlxsw_sp_netdevice_event(struct notifier_block *nb,
53345334
else if (mlxsw_sp_netdev_is_ipip_ul(mlxsw_sp, dev))
53355335
err = mlxsw_sp_netdevice_ipip_ul_event(mlxsw_sp, dev,
53365336
event, ptr);
5337-
else if (event == NETDEV_CHANGEADDR || event == NETDEV_CHANGEMTU)
5337+
else if (event == NETDEV_PRE_CHANGEADDR ||
5338+
event == NETDEV_CHANGEADDR ||
5339+
event == NETDEV_CHANGEMTU)
53385340
err = mlxsw_sp_netdevice_router_port_event(dev, event, ptr);
53395341
else if (mlxsw_sp_is_vrf_event(event, ptr))
53405342
err = mlxsw_sp_netdevice_vrf_event(dev, event, ptr);

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

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6699,6 +6699,33 @@ static int mlxsw_sp_inetaddr_macvlan_event(struct net_device *macvlan_dev,
66996699
return 0;
67006700
}
67016701

6702+
static int mlxsw_sp_router_port_check_rif_addr(struct mlxsw_sp *mlxsw_sp,
6703+
struct net_device *dev,
6704+
const unsigned char *dev_addr,
6705+
struct netlink_ext_ack *extack)
6706+
{
6707+
struct mlxsw_sp_rif *rif;
6708+
int i;
6709+
6710+
/* A RIF is not created for macvlan netdevs. Their MAC is used to
6711+
* populate the FDB
6712+
*/
6713+
if (netif_is_macvlan(dev))
6714+
return 0;
6715+
6716+
for (i = 0; i < MLXSW_CORE_RES_GET(mlxsw_sp->core, MAX_RIFS); i++) {
6717+
rif = mlxsw_sp->router->rifs[i];
6718+
if (rif && rif->dev != dev &&
6719+
!ether_addr_equal_masked(rif->dev->dev_addr, dev_addr,
6720+
mlxsw_sp->mac_mask)) {
6721+
NL_SET_ERR_MSG_MOD(extack, "All router interface MAC addresses must have the same prefix");
6722+
return -EINVAL;
6723+
}
6724+
}
6725+
6726+
return 0;
6727+
}
6728+
67026729
static int __mlxsw_sp_inetaddr_event(struct net_device *dev,
67036730
unsigned long event,
67046731
struct netlink_ext_ack *extack)
@@ -6760,6 +6787,11 @@ int mlxsw_sp_inetaddr_valid_event(struct notifier_block *unused,
67606787
if (!mlxsw_sp_rif_should_config(rif, dev, event))
67616788
goto out;
67626789

6790+
err = mlxsw_sp_router_port_check_rif_addr(mlxsw_sp, dev, dev->dev_addr,
6791+
ivi->extack);
6792+
if (err)
6793+
goto out;
6794+
67636795
err = __mlxsw_sp_inetaddr_event(dev, event, ivi->extack);
67646796
out:
67656797
return notifier_from_errno(err);
@@ -6841,6 +6873,11 @@ int mlxsw_sp_inet6addr_valid_event(struct notifier_block *unused,
68416873
if (!mlxsw_sp_rif_should_config(rif, dev, event))
68426874
goto out;
68436875

6876+
err = mlxsw_sp_router_port_check_rif_addr(mlxsw_sp, dev, dev->dev_addr,
6877+
i6vi->extack);
6878+
if (err)
6879+
goto out;
6880+
68446881
err = __mlxsw_sp_inetaddr_event(dev, event, i6vi->extack);
68456882
out:
68466883
return notifier_from_errno(err);
@@ -6914,6 +6951,16 @@ mlxsw_sp_router_port_change_event(struct mlxsw_sp *mlxsw_sp,
69146951
return err;
69156952
}
69166953

6954+
static int mlxsw_sp_router_port_pre_changeaddr_event(struct mlxsw_sp_rif *rif,
6955+
struct netdev_notifier_pre_changeaddr_info *info)
6956+
{
6957+
struct netlink_ext_ack *extack;
6958+
6959+
extack = netdev_notifier_info_to_extack(&info->info);
6960+
return mlxsw_sp_router_port_check_rif_addr(rif->mlxsw_sp, rif->dev,
6961+
info->dev_addr, extack);
6962+
}
6963+
69176964
int mlxsw_sp_netdevice_router_port_event(struct net_device *dev,
69186965
unsigned long event, void *ptr)
69196966
{
@@ -6932,6 +6979,8 @@ int mlxsw_sp_netdevice_router_port_event(struct net_device *dev,
69326979
case NETDEV_CHANGEMTU: /* fall through */
69336980
case NETDEV_CHANGEADDR:
69346981
return mlxsw_sp_router_port_change_event(mlxsw_sp, rif);
6982+
case NETDEV_PRE_CHANGEADDR:
6983+
return mlxsw_sp_router_port_pre_changeaddr_event(rif, ptr);
69356984
}
69366985

69376986
return 0;

0 commit comments

Comments
 (0)