* [PATCH] wifi: ath11k: Fix memory leak in ath11k_peer_rx_frag_setup
@ 2022-12-29 7:38 Miaoqian Lin
2023-01-01 7:44 ` Leon Romanovsky
0 siblings, 1 reply; 2+ messages in thread
From: Miaoqian Lin @ 2022-12-29 7:38 UTC (permalink / raw)
To: Kalle Valo, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Manikanta Pubbisetty, ath11k, linux-wireless, netdev,
linux-kernel
Cc: linmq006
crypto_alloc_shash() allocates resources, which should be released by
crypto_free_shash(). When ath11k_peer_find() fails, there has memory
leak. Move crypto_alloc_shash() after ath11k_peer_find() to fix this.
Fixes: 243874c64c81 ("ath11k: handle RX fragments")
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
---
drivers/net/wireless/ath/ath11k/dp_rx.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/ath/ath11k/dp_rx.c b/drivers/net/wireless/ath/ath11k/dp_rx.c
index c5a4c34d7749..1297caa2b09a 100644
--- a/drivers/net/wireless/ath/ath11k/dp_rx.c
+++ b/drivers/net/wireless/ath/ath11k/dp_rx.c
@@ -3116,10 +3116,6 @@ int ath11k_peer_rx_frag_setup(struct ath11k *ar, const u8 *peer_mac, int vdev_id
struct dp_rx_tid *rx_tid;
int i;
- tfm = crypto_alloc_shash("michael_mic", 0, 0);
- if (IS_ERR(tfm))
- return PTR_ERR(tfm);
-
spin_lock_bh(&ab->base_lock);
peer = ath11k_peer_find(ab, vdev_id, peer_mac);
@@ -3129,6 +3125,10 @@ int ath11k_peer_rx_frag_setup(struct ath11k *ar, const u8 *peer_mac, int vdev_id
return -ENOENT;
}
+ tfm = crypto_alloc_shash("michael_mic", 0, 0);
+ if (IS_ERR(tfm))
+ return PTR_ERR(tfm);
+
for (i = 0; i <= IEEE80211_NUM_TIDS; i++) {
rx_tid = &peer->rx_tid[i];
rx_tid->ab = ab;
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] wifi: ath11k: Fix memory leak in ath11k_peer_rx_frag_setup
2022-12-29 7:38 [PATCH] wifi: ath11k: Fix memory leak in ath11k_peer_rx_frag_setup Miaoqian Lin
@ 2023-01-01 7:44 ` Leon Romanovsky
0 siblings, 0 replies; 2+ messages in thread
From: Leon Romanovsky @ 2023-01-01 7:44 UTC (permalink / raw)
To: Miaoqian Lin
Cc: Kalle Valo, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Manikanta Pubbisetty, ath11k, linux-wireless, netdev,
linux-kernel
On Thu, Dec 29, 2022 at 11:38:48AM +0400, Miaoqian Lin wrote:
> crypto_alloc_shash() allocates resources, which should be released by
> crypto_free_shash(). When ath11k_peer_find() fails, there has memory
> leak. Move crypto_alloc_shash() after ath11k_peer_find() to fix this.
>
> Fixes: 243874c64c81 ("ath11k: handle RX fragments")
> Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
> ---
> drivers/net/wireless/ath/ath11k/dp_rx.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath11k/dp_rx.c b/drivers/net/wireless/ath/ath11k/dp_rx.c
> index c5a4c34d7749..1297caa2b09a 100644
> --- a/drivers/net/wireless/ath/ath11k/dp_rx.c
> +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c
> @@ -3116,10 +3116,6 @@ int ath11k_peer_rx_frag_setup(struct ath11k *ar, const u8 *peer_mac, int vdev_id
> struct dp_rx_tid *rx_tid;
> int i;
>
> - tfm = crypto_alloc_shash("michael_mic", 0, 0);
> - if (IS_ERR(tfm))
> - return PTR_ERR(tfm);
> -
> spin_lock_bh(&ab->base_lock);
>
> peer = ath11k_peer_find(ab, vdev_id, peer_mac);
> @@ -3129,6 +3125,10 @@ int ath11k_peer_rx_frag_setup(struct ath11k *ar, const u8 *peer_mac, int vdev_id
> return -ENOENT;
> }
>
> + tfm = crypto_alloc_shash("michael_mic", 0, 0);
> + if (IS_ERR(tfm))
> + return PTR_ERR(tfm);
> +
You forgot to unlock ab->base_lock.
Thanks
> for (i = 0; i <= IEEE80211_NUM_TIDS; i++) {
> rx_tid = &peer->rx_tid[i];
> rx_tid->ab = ab;
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-01-01 7:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-12-29 7:38 [PATCH] wifi: ath11k: Fix memory leak in ath11k_peer_rx_frag_setup Miaoqian Lin
2023-01-01 7:44 ` Leon Romanovsky
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).