diff options
| author | Sabrina Dubroca | 2022-09-23 11:07:09 +0200 |
|---|---|---|
| committer | Jakub Kicinski | 2022-09-26 09:39:30 -0700 |
| commit | c52add61c27ea23501be82a34854edd98e10e061 (patch) | |
| tree | f103cfdd204857093becccfc22a0755d24c9ff5b | |
| parent | 9258b8b1be2e1e241baf8aa703aba1086069ee0f (diff) | |
macsec: don't free NULL metadata_dst
Commit 0a28bfd4971f added a metadata_dst to each tx_sc, but that's
only allocated when macsec_add_dev has run, which happens after device
registration. If the requested or computed SCI already exists, or if
linking to the lower device fails, we will panic because
metadata_dst_free can't handle NULL.
Reproducer:
ip link add link $lower type macsec
ip link add link $lower type macsec
Fixes: 0a28bfd4971f ("net/macsec: Add MACsec skb_metadata_dst Tx Data path support")
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Acked-by: Raed Salem <raeds@nvidia.com>
Link: https://lore.kernel.org/r/60f2a1965fe553e2cade9472407d0fafff8de8ce.1663923580.git.sd@queasysnail.net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
| -rw-r--r-- | drivers/net/macsec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c index 8193ab39206f..c891b60937a7 100644 --- a/drivers/net/macsec.c +++ b/drivers/net/macsec.c @@ -3720,7 +3720,8 @@ static void macsec_free_netdev(struct net_device *dev) { struct macsec_dev *macsec = macsec_priv(dev); - metadata_dst_free(macsec->secy.tx_sc.md_dst); + if (macsec->secy.tx_sc.md_dst) + metadata_dst_free(macsec->secy.tx_sc.md_dst); free_percpu(macsec->stats); free_percpu(macsec->secy.tx_sc.stats); |