Ver Fonte

ath9k: Protect queue draining by rcu_read_lock()

When ath9k was switched over to use the mac80211 intermediate queues,
node cleanup now drains the mac80211 queues. However, this call path is
not protected by rcu_read_lock() as it was previously entirely internal
to the driver which uses its own locking.

This leads to a possible rcu_dereference() without holding
rcu_read_lock(); but only if a station is cleaned up while having
packets queued on the TXQ. Fix this by adding the rcu_read_lock() to the
caller in ath9k.

Fixes: 50f08edf9809 ("ath9k: Switch to using mac80211 intermediate software queues.")
Cc: stable@vger.kernel.org
Reported-by: Ben Greear <greearb@candelatech.com>
Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Toke Høiland-Jørgensen há 7 anos atrás
pai
commit
182b191710
1 ficheiros alterados com 4 adições e 0 exclusões
  1. 4 0
      drivers/net/wireless/ath/ath9k/xmit.c

+ 4 - 0
drivers/net/wireless/ath/ath9k/xmit.c

@@ -2892,6 +2892,8 @@ void ath_tx_node_cleanup(struct ath_softc *sc, struct ath_node *an)
 	struct ath_txq *txq;
 	struct ath_txq *txq;
 	int tidno;
 	int tidno;
 
 
+	rcu_read_lock();
+
 	for (tidno = 0; tidno < IEEE80211_NUM_TIDS; tidno++) {
 	for (tidno = 0; tidno < IEEE80211_NUM_TIDS; tidno++) {
 		tid = ath_node_to_tid(an, tidno);
 		tid = ath_node_to_tid(an, tidno);
 		txq = tid->txq;
 		txq = tid->txq;
@@ -2909,6 +2911,8 @@ void ath_tx_node_cleanup(struct ath_softc *sc, struct ath_node *an)
 		if (!an->sta)
 		if (!an->sta)
 			break; /* just one multicast ath_atx_tid */
 			break; /* just one multicast ath_atx_tid */
 	}
 	}
+
+	rcu_read_unlock();
 }
 }
 
 
 #ifdef CONFIG_ATH9K_TX99
 #ifdef CONFIG_ATH9K_TX99