summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJianglei Nie <niejianglei2021@163.com>2022-07-22 17:29:02 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-08-03 12:00:48 +0200
commit530a4da37ece1dd071eeb2e93fb353c56254e407 (patch)
treed25f0fe7fb451645bf4fa584783dfaad11c9aa5c /drivers
parent6e0e0464f1da3eb76695ba231ab7e7e64c2c154f (diff)
downloadlinux-stable-530a4da37ece1dd071eeb2e93fb353c56254e407.tar.gz
linux-stable-530a4da37ece1dd071eeb2e93fb353c56254e407.tar.bz2
linux-stable-530a4da37ece1dd071eeb2e93fb353c56254e407.zip
net: macsec: fix potential resource leak in macsec_add_rxsa() and macsec_add_txsa()
[ Upstream commit c7b205fbbf3cffa374721bb7623f7aa8c46074f1 ] init_rx_sa() allocates relevant resource for rx_sa->stats and rx_sa-> key.tfm with alloc_percpu() and macsec_alloc_tfm(). When some error occurs after init_rx_sa() is called in macsec_add_rxsa(), the function released rx_sa with kfree() without releasing rx_sa->stats and rx_sa-> key.tfm, which will lead to a resource leak. We should call macsec_rxsa_put() instead of kfree() to decrease the ref count of rx_sa and release the relevant resource if the refcount is 0. The same bug exists in macsec_add_txsa() for tx_sa as well. This patch fixes the above two bugs. Fixes: 3cf3227a21d1 ("net: macsec: hardware offloading infrastructure") Signed-off-by: Jianglei Nie <niejianglei2021@163.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/macsec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/macsec.c b/drivers/net/macsec.c
index 8d73b72d6179..70c5905a916b 100644
--- a/drivers/net/macsec.c
+++ b/drivers/net/macsec.c
@@ -1841,7 +1841,7 @@ static int macsec_add_rxsa(struct sk_buff *skb, struct genl_info *info)
return 0;
cleanup:
- kfree(rx_sa);
+ macsec_rxsa_put(rx_sa);
rtnl_unlock();
return err;
}
@@ -2084,7 +2084,7 @@ static int macsec_add_txsa(struct sk_buff *skb, struct genl_info *info)
cleanup:
secy->operational = was_operational;
- kfree(tx_sa);
+ macsec_txsa_put(tx_sa);
rtnl_unlock();
return err;
}