iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mac80211: fix txq queue related crashes

Browse Source 
The driver can access the queue simultanously
while mac80211 tears down the interface. Without
spinlock protection this could lead to corrupting
sk_buff_head and subsequently to an invalid
pointer dereference.

Fixes: ba8c3d6f16a1 ("mac80211: add an intermediate software queue implementation")
Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Michal Kazior 2016-01-21 14:23:07 +01:00 committed by Johannes Berg
parent b8631c0033
commit 2a58d42c1e
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/mac80211/iface.c
View File

@ -977,7 +977,10 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
if (sdata->vif.txq) { if (sdata->vif.txq) {
struct txq_info *txqi = to_txq_info(sdata->vif.txq); struct txq_info *txqi = to_txq_info(sdata->vif.txq);
spin_lock_bh(&txqi->queue.lock);
ieee80211_purge_tx_queue(&local->hw, &txqi->queue); ieee80211_purge_tx_queue(&local->hw, &txqi->queue);
spin_unlock_bh(&txqi->queue.lock);
atomic_set(&sdata->txqs_len[txqi->txq.ac], 0); atomic_set(&sdata->txqs_len[txqi->txq.ac], 0);
} }