wifi: ath12k: Fix memory leak due to multiple rx_stats allocation
PATCH 1/1 wifi: ath12k: Fix memory leak due to multiple rx_stats allocation
From: Sidhanta Sahu <[email protected]>
rx_stats for each arsta is allocated when adding a station. arsta->rx_stats will be freed when a station is removed.
Redundant allocations are occurring when the same station is added multiple times. This causes ath12k_mac_station_add() to be called multiple times, and rx_stats is allocated each time. As a result there is memory leaks.
Prevent multiple allocations of rx_stats when ath12k_mac_station_add() is called repeatedly by checking if rx_stats is already allocated before allocating again. Allocate arsta->rx_stats if arsta->rx_stats is NULL respectively.
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00173-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
--- drivers/net/wireless/ath/ath12k/mac.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath12k/mac.c +6 -3
@@ -5663,10 +5663,13 @@ static int ath12k_mac_station_add(struct ath12k *ar, ar->max_num_stations); goto exit; } - arsta->rx_stats =kzalloc (sizeof (*arsta->rx_stats),GFP_KERNEL ); +if (!arsta->rx_stats) { - ret = -ENOMEM ; - goto dec_num_station; + arsta->rx_stats =kzalloc (sizeof (*arsta->rx_stats),GFP_KERNEL ); +if (!arsta->rx_stats) { + ret = -ENOMEM ; + goto dec_num_station; + } } peer_param.vdev_id = arvif->vdev_id;
base-commit: c0dd3f4f70918cbcdd8da611811036a91b7dce33
Signature · 1 line
2.34.1
Quoted 46 lines · Muna Sinada
From: Sidhanta Sahu <[email protected]>
rx_statsfor each arsta is allocated when adding a station.arsta->rx_statswill be freed when a station is removed.Redundant allocations are occurring when the same station is added multiple times. This causes
ath12k_mac_station_add()to be called multiple times, andrx_statsis allocated each time. As a result there is memory leaks.Prevent multiple allocations of
rx_statswhenath12k_mac_station_add()is called repeatedly by checking ifrx_statsis already allocated before allocating again. Allocatearsta->rx_statsifarsta->rx_statsis NULL respectively.Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00173-QCAHKSWPL_SILICONZ-1
Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3Signed-off-by Sidhanta Sahu <[email protected]>Signed-off-by Muna Sinada <[email protected]>--- drivers/net/wireless/ath/ath12k/mac.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)drivers/net/wireless/ath/ath12k/mac.c +6
-3@@ -5663,10 +5663,13 @@ static int ath12k_mac_station_add(struct ath12k *ar, ar->max_num_stations); goto exit; } - arsta->rx_stats =kzalloc (sizeof (*arsta->rx_stats),GFP_KERNEL ); +if (!arsta->rx_stats) { - ret = -ENOMEM ; - goto dec_num_station; + arsta->rx_stats =kzalloc (sizeof (*arsta->rx_stats),GFP_KERNEL ); +if (!arsta->rx_stats) { + ret = -ENOMEM ; + goto dec_num_station; + } } peer_param.vdev_id = arvif->vdev_id;
Quoted 1 line
base-commit:
c0dd3f4f70918cbcdd8da611811036a91b7dce33
Jeff Johnson
AppliedQuoted 9 lines · Muna Sinada
rx_statsfor each arsta is allocated when adding a station.arsta->rx_statswill be freed when a station is removed.Redundant allocations are occurring when the same station is added multiple times. This causes
ath12k_mac_station_add()to be called multiple times, andrx_statsis allocated each time. As a result there is memory leaks.[...]
Applied, thanks!
[1/1] wifi: ath12k: Fix memory leak due to multiple rx_stats allocation
commit: c426497fa2055c8005196922e7d29c41d7e0948a
Best regards,
Signature · 1 line
Jeff Johnson <[email protected]>