Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38787fc2 authored by Sabrina Dubroca's avatar Sabrina Dubroca Committed by David S. Miller
Browse files

macsec: fix SA leak if initialization fails 



Fixes: c09440f7 ("macsec: introduce IEEE 802.1AE driver")
Reported-by: default avatarLance Richardson <lrichard@redhat.com>
Signed-off-by: default avatarSabrina Dubroca <sd@queasysnail.net>
Acked-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 960d5848

drivers/net/macsec.c

+2 −0
Original line number Diff line number Diff line
@@ -1627,6 +1627,7 @@ static int macsec_add_rxsa(struct sk_buff *skb, struct genl_info *info) 
	rx_sa = kmalloc(sizeof(*rx_sa), GFP_KERNEL);

	if (!rx_sa || init_rx_sa(rx_sa, nla_data(tb_sa[MACSEC_SA_ATTR_KEY]),

				 secy->key_len, secy->icv_len)) {

		kfree(rx_sa);

		rtnl_unlock();

		return -ENOMEM;

	}
@@ -1771,6 +1772,7 @@ static int macsec_add_txsa(struct sk_buff *skb, struct genl_info *info) 
	tx_sa = kmalloc(sizeof(*tx_sa), GFP_KERNEL);

	if (!tx_sa || init_tx_sa(tx_sa, nla_data(tb_sa[MACSEC_SA_ATTR_KEY]),

				 secy->key_len, secy->icv_len)) {

		kfree(tx_sa);

		rtnl_unlock();

		return -ENOMEM;

	}