summaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorMichal Kazior <michal.kazior@tieto.com>2016-01-21 14:23:07 +0100
committerJohannes Berg <johannes.berg@intel.com>2016-02-24 09:04:26 +0100
commit2a58d42c1e018ad514d4e23fd33fb2ded95d3ee6 (patch)
tree9c5d42d64aa67483d915834b129261bdce7119fd /net/mac80211
parentb8631c003307bc7abf0180d950c42d9032ebda70 (diff)
downloadop-kernel-dev-2a58d42c1e018ad514d4e23fd33fb2ded95d3ee6.zip
op-kernel-dev-2a58d42c1e018ad514d4e23fd33fb2ded95d3ee6.tar.gz
mac80211: fix txq queue related crashes
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>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/iface.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 33ae3c8..0451f12 100644
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -977,7 +977,10 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
if (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);
+ spin_unlock_bh(&txqi->queue.lock);
+
atomic_set(&sdata->txqs_len[txqi->txq.ac], 0);
}
OpenPOWER on IntegriCloud