mac80211: fix txq queue related crashes

Orabug: 25308062

[ Upstream commit 2a58d42c1e018ad514d4e23fd33fb2ded95d3ee6 ]

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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
(cherry picked from commit 17e8cd1e540985cd11cc6f007867fa1679b8f866)
Signed-off-by: Dhaval Giani <dhaval.giani@oracle.com>

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index 84cef600c5730e74c6456e801ffa93ef55e4e47f..6e89ab8eac449eec06e144c653adc655ff1e5686 100644 (file)
--- a/net/mac80211/iface.c
+++ b/net/mac80211/iface.c
@@ -980,7 +980,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);
        }