瀏覽代碼

ath9k: fix race conditions when stop device

We do not kill any scheduled tasklets when stopping device, that may
cause usage of resources after free. Moreover we enable interrupts
in tasklet function, so we could potentially end with interrupts
enabled when driver is not ready to receive them.

I think patch should fix Ben's kernel crash from:
http://marc.info/?l=linux-wireless&m=129438358921501&w=2

Cc: stable@kernel.org
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Stanislaw Gruszka 14 年之前
父節點
當前提交
203043f579
共有 2 個文件被更改,包括 9 次插入5 次删除
  1. 0 5
      drivers/net/wireless/ath/ath9k/init.c
  2. 9 0
      drivers/net/wireless/ath/ath9k/main.c

+ 0 - 5
drivers/net/wireless/ath/ath9k/init.c

@@ -598,8 +598,6 @@ err_btcoex:
 err_queues:
 err_queues:
 	ath9k_hw_deinit(ah);
 	ath9k_hw_deinit(ah);
 err_hw:
 err_hw:
-	tasklet_kill(&sc->intr_tq);
-	tasklet_kill(&sc->bcon_tasklet);
 
 
 	kfree(ah);
 	kfree(ah);
 	sc->sc_ah = NULL;
 	sc->sc_ah = NULL;
@@ -807,9 +805,6 @@ static void ath9k_deinit_softc(struct ath_softc *sc)
 
 
 	ath9k_hw_deinit(sc->sc_ah);
 	ath9k_hw_deinit(sc->sc_ah);
 
 
-	tasklet_kill(&sc->intr_tq);
-	tasklet_kill(&sc->bcon_tasklet);
-
 	kfree(sc->sc_ah);
 	kfree(sc->sc_ah);
 	sc->sc_ah = NULL;
 	sc->sc_ah = NULL;
 }
 }

+ 9 - 0
drivers/net/wireless/ath/ath9k/main.c

@@ -1309,6 +1309,9 @@ static void ath9k_stop(struct ieee80211_hw *hw)
 
 
 	spin_lock_bh(&sc->sc_pcu_lock);
 	spin_lock_bh(&sc->sc_pcu_lock);
 
 
+	/* prevent tasklets to enable interrupts once we disable them */
+	ah->imask &= ~ATH9K_INT_GLOBAL;
+
 	/* make sure h/w will not generate any interrupt
 	/* make sure h/w will not generate any interrupt
 	 * before setting the invalid flag. */
 	 * before setting the invalid flag. */
 	ath9k_hw_disable_interrupts(ah);
 	ath9k_hw_disable_interrupts(ah);
@@ -1326,6 +1329,12 @@ static void ath9k_stop(struct ieee80211_hw *hw)
 
 
 	spin_unlock_bh(&sc->sc_pcu_lock);
 	spin_unlock_bh(&sc->sc_pcu_lock);
 
 
+	/* we can now sync irq and kill any running tasklets, since we already
+	 * disabled interrupts and not holding a spin lock */
+	synchronize_irq(sc->irq);
+	tasklet_kill(&sc->intr_tq);
+	tasklet_kill(&sc->bcon_tasklet);
+
 	ath9k_ps_restore(sc);
 	ath9k_ps_restore(sc);
 
 
 	sc->ps_idle = true;
 	sc->ps_idle = true;