From: Miaoqing Pan Date: Tue, 27 Jun 2017 14:31:55 +0000 (+0300) Subject: ath9k: Use mutex_lock to avoid potential race in start/stop rng X-Git-Tag: MMI-PSA29.97-13-9~5285^2~16^2~7^2~2 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f23cdfb3fe8f6e3502b8aebb819edf5669c1d802;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git ath9k: Use mutex_lock to avoid potential race in start/stop rng Move ath9k_rng_stop/ath9k_rng_start pair into critical section, use mutex_lock to void potential race accessing. Signed-off-by: Miaoqing Pan Signed-off-by: Kalle Valo --- diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index 9e65d14e7b1e..8b4ac7f0a09b 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c @@ -731,12 +731,12 @@ static int ath9k_start(struct ieee80211_hw *hw) spin_unlock_bh(&sc->sc_pcu_lock); + ath9k_rng_start(sc); + mutex_unlock(&sc->mutex); ath9k_ps_restore(sc); - ath9k_rng_start(sc); - return 0; } @@ -826,10 +826,10 @@ static void ath9k_stop(struct ieee80211_hw *hw) ath9k_deinit_channel_context(sc); - ath9k_rng_stop(sc); - mutex_lock(&sc->mutex); + ath9k_rng_stop(sc); + ath_cancel_work(sc); if (test_bit(ATH_OP_INVALID, &common->op_flags)) {