[PATCH net-next v7 3/7] net: macsec: revert the MAC address if mdo_upd_secy fails
flat view
STALE1097d
SUPERSEDED
From: Radu Pirea (NXP OSS) <hidden>
Date: 2023-10-19 12:03:49
Also in:
lkml
Subsystem:
networking drivers, networking [macsec], the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Sabrina Dubroca, Linus Torvalds
Revision v7 of 9 in this series.
Revisions (9)
Revert the MAC address if mdo_upd_secy fails. Offloaded MACsec device might be left in an inconsistent state. Signed-off-by: Radu Pirea (NXP OSS) <redacted> --- Changes in v7: - patch added in v7 drivers/net/macsec.c | 52 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 43 insertions(+), 9 deletions(-)
diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c
index 9663050a852d..569b27b2e276 100644
--- a/drivers/net/macsec.c
+++ b/drivers/net/macsec.c@@ -3599,11 +3599,27 @@ static void macsec_dev_set_rx_mode(struct net_device *dev) dev_uc_sync(real_dev, dev); } -static int macsec_set_mac_address(struct net_device *dev, void *p) +static int macsec_dev_uc_update(struct net_device *dev, u8 *new_addr) { struct macsec_dev *macsec = macsec_priv(dev); struct net_device *real_dev = macsec->real_dev; + int err; + + err = dev_uc_add(real_dev, new_addr); + if (err < 0) + return err; + + dev_uc_del(real_dev, dev->dev_addr); + + return 0; +} + +static int macsec_set_mac_address(struct net_device *dev, void *p) +{ + struct macsec_dev *macsec = macsec_priv(dev); + bool offloaded = macsec_is_offloaded(macsec); struct sockaddr *addr = p; + u8 old_addr[ETH_ALEN]; int err; if (!is_valid_ether_addr(addr->sa_data))
@@ -3612,28 +3628,46 @@ static int macsec_set_mac_address(struct net_device *dev, void *p) if (!(dev->flags & IFF_UP)) goto out; - err = dev_uc_add(real_dev, addr->sa_data); - if (err < 0) + err = macsec_dev_uc_update(dev, addr->sa_data); + if (err) return err; - dev_uc_del(real_dev, dev->dev_addr); - out: + if (offloaded) + ether_addr_copy(old_addr, dev->dev_addr); eth_hw_addr_set(dev, addr->sa_data); /* If h/w offloading is available, propagate to the device */ - if (macsec_is_offloaded(macsec)) { + if (offloaded) { const struct macsec_ops *ops; struct macsec_context ctx; ops = macsec_get_ops(macsec, &ctx); - if (ops) { - ctx.secy = &macsec->secy; - macsec_offload(ops->mdo_upd_secy, &ctx); + if (!ops) { + err = -EINVAL; + goto restore_old_addr; } + + ctx.secy = &macsec->secy; + err = macsec_offload(ops->mdo_upd_secy, &ctx); + if (err) + goto restore_old_addr; } return 0; + +restore_old_addr: + if (dev->flags & IFF_UP) { + int err; + + err = macsec_dev_uc_update(dev, old_addr); + if (err) + return err; + } + + eth_hw_addr_set(dev, old_addr); + + return err; } static int macsec_change_mtu(struct net_device *dev, int new_mtu)
--
2.34.1