aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/sta_info.c
diff options
context:
space:
mode:
authorYogesh Ashok Powar <yogeshp@marvell.com>2011-12-08 04:26:15 -0500
committerJohn W. Linville <linville@tuxdriver.com>2011-12-13 15:30:33 -0500
commit42624d4913a00219a8fdbb4bafd634d1d843be85 (patch)
tree0cf641329ff23e4ca159e44506ffa74cf9f9b623 /net/mac80211/sta_info.c
parentadbde344dc12514d68620afae8d34035e72544b1 (diff)
mac80211: Purge A-MPDU TX queues before station destructions
When a station leaves suddenly while ampdu traffic to that station is still running, there is a possibility that the ampdu pending queues are not freed due to a race condition leading to memory leaks. In '__sta_info_destroy' when we attempt to destroy the ampdu sessions in 'ieee80211_sta_tear_down_BA_sessions', the driver calls 'ieee80211_stop_tx_ba_cb_irqsafe' to delete the ampdu structures (tid_tx) and splice the pending queues and this job gets queued in sdata workqueue. However, the sta entry can get destroyed before the above work gets scheduled and hence the race. Purging the queues and freeing the tid_tx to avoid the leak. The better solution would be to fix the race, but that can be taken up in a separate patch. Signed-off-by: Nishant Sarmukadam <nishants@marvell.com> Signed-off-by: Yogesh Ashok Powar <yogeshp@marvell.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211/sta_info.c')
-rw-r--r--net/mac80211/sta_info.c25
1 files changed, 25 insertions, 0 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index f98235262006..c6ca9bd81add 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -851,6 +851,7 @@ static int __must_check __sta_info_destroy(struct sta_info *sta)
851 struct ieee80211_sub_if_data *sdata; 851 struct ieee80211_sub_if_data *sdata;
852 unsigned long flags; 852 unsigned long flags;
853 int ret, i, ac; 853 int ret, i, ac;
854 struct tid_ampdu_tx *tid_tx;
854 855
855 might_sleep(); 856 might_sleep();
856 857
@@ -949,6 +950,30 @@ static int __must_check __sta_info_destroy(struct sta_info *sta)
949 } 950 }
950#endif 951#endif
951 952
953 /* There could be some memory leaks because of ampdu tx pending queue
954 * not being freed before destroying the station info.
955 *
956 * Make sure that such queues are purged before freeing the station
957 * info.
958 * TODO: We have to somehow postpone the full destruction
959 * until the aggregation stop completes. Refer
960 * http://thread.gmane.org/gmane.linux.kernel.wireless.general/81936
961 */
962 for (i = 0; i < STA_TID_NUM; i++) {
963 if (!sta->ampdu_mlme.tid_tx[i])
964 continue;
965 tid_tx = sta->ampdu_mlme.tid_tx[i];
966 if (skb_queue_len(&tid_tx->pending)) {
967#ifdef CONFIG_MAC80211_HT_DEBUG
968 wiphy_debug(local->hw.wiphy, "TX A-MPDU purging %d "
969 "packets for tid=%d\n",
970 skb_queue_len(&tid_tx->pending), i);
971#endif /* CONFIG_MAC80211_HT_DEBUG */
972 __skb_queue_purge(&tid_tx->pending);
973 }
974 kfree_rcu(tid_tx, rcu_head);
975 }
976
952 __sta_info_free(local, sta); 977 __sta_info_free(local, sta);
953 978
954 return 0; 979 return 0;