Commit a2d8bf77 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'MACSec-bugfixes-related-to-MAC-address-change' 



Igor Russkikh says:

====================
MACSec bugfixes related to MAC address change

We found out that there's an issue in MACSec code when the MAC address
is changed.
Both s/w and offloaded implementations don't update SCI when the MAC
address changes at the moment, but they should do so, because SCI contains
MAC in its first 6 octets.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 7d7195a0 09f4136c

drivers/net/macsec.c

+19 −5
Original line number Diff line number Diff line
@@ -424,6 +424,11 @@ static struct macsec_eth_header *macsec_ethhdr(struct sk_buff *skb) 
	return (struct macsec_eth_header *)skb_mac_header(skb);

}



static sci_t dev_to_sci(struct net_device *dev, __be16 port)

{

	return make_sci(dev->dev_addr, port);

}



static void __macsec_pn_wrapped(struct macsec_secy *secy,

				struct macsec_tx_sa *tx_sa)

{
@@ -3268,6 +3273,20 @@ static int macsec_set_mac_address(struct net_device *dev, void *p) 


out:

	ether_addr_copy(dev->dev_addr, addr->sa_data);

	macsec->secy.sci = dev_to_sci(dev, MACSEC_PORT_ES);



	/* If h/w offloading is available, propagate to the device */

	if (macsec_is_offloaded(macsec)) {

		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);

		}

	}



	return 0;

}
@@ -3593,11 +3612,6 @@ static bool sci_exists(struct net_device *dev, sci_t sci) 
	return false;

}



static sci_t dev_to_sci(struct net_device *dev, __be16 port)

{

	return make_sci(dev->dev_addr, port);

}



static int macsec_add_dev(struct net_device *dev, sci_t sci, u8 icv_len)

{

	struct macsec_dev *macsec = macsec_priv(dev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE