34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
|
From: Felix Fietkau <nbd@nbd.name>
|
||
|
|
Date: Tue, 2 Aug 2016 13:00:01 +0200
|
||
|
|
Subject: [PATCH] ath9k: fix using sta->drv_priv before initializing it
|
||
|
|
|
||
|
|
A station pointer can be passed to the driver on tx, before it has been
|
||
|
|
marked as associated. Since ath9k_sta_state was initializing the entry
|
||
|
|
too late, it resulted in some spurious crashes.
|
||
|
|
|
||
|
|
Fixes: df3c6eb34da5 ("ath9k: Use sta_state() callback")
|
||
|
|
Cc: stable@vger.kernel.org
|
||
|
|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||
|
|
---
|
||
|
|
|
||
|
|
--- a/drivers/net/wireless/ath/ath9k/main.c
|
||
|
|
+++ b/drivers/net/wireless/ath/ath9k/main.c
|
||
|
|
@@ -1563,13 +1563,13 @@ static int ath9k_sta_state(struct ieee80
|
||
|
|
struct ath_common *common = ath9k_hw_common(sc->sc_ah);
|
||
|
|
int ret = 0;
|
||
|
|
|
||
|
|
- if (old_state == IEEE80211_STA_AUTH &&
|
||
|
|
- new_state == IEEE80211_STA_ASSOC) {
|
||
|
|
+ if (old_state == IEEE80211_STA_NOTEXIST &&
|
||
|
|
+ new_state == IEEE80211_STA_NONE) {
|
||
|
|
ret = ath9k_sta_add(hw, vif, sta);
|
||
|
|
ath_dbg(common, CONFIG,
|
||
|
|
"Add station: %pM\n", sta->addr);
|
||
|
|
- } else if (old_state == IEEE80211_STA_ASSOC &&
|
||
|
|
- new_state == IEEE80211_STA_AUTH) {
|
||
|
|
+ } else if (old_state == IEEE80211_STA_NONE &&
|
||
|
|
+ new_state == IEEE80211_STA_NOTEXIST) {
|
||
|
|
ret = ath9k_sta_remove(hw, vif, sta);
|
||
|
|
ath_dbg(common, CONFIG,
|
||
|
|
"Remove station: %pM\n", sta->addr);
|