diff options
| author | Felix Fietkau <nbd@nbd.name> | 2021-02-01 09:33:24 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-02-10 09:25:29 +0100 |
| commit | efa17285b3384607cfa4e5eabccb4f84b1489009 (patch) | |
| tree | ad0879293d003b82c7d581949cb7a76d71923b38 | |
| parent | ecdd962c4b9bd5bb49df902b2ed25e2a15975cae (diff) | |
| download | linux-stable-efa17285b3384607cfa4e5eabccb4f84b1489009.tar.gz linux-stable-efa17285b3384607cfa4e5eabccb4f84b1489009.tar.bz2 linux-stable-efa17285b3384607cfa4e5eabccb4f84b1489009.zip | |
mac80211: fix station rate table updates on assoc
commit 18fe0fae61252b5ae6e26553e2676b5fac555951 upstream.
If the driver uses .sta_add, station entries are only uploaded after the sta
is in assoc state. Fix early station rate table updates by deferring them
until the sta has been uploaded.
Cc: stable@vger.kernel.org
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Link: https://lore.kernel.org/r/20210201083324.3134-1-nbd@nbd.name
[use rcu_access_pointer() instead since we won't dereference here]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/mac80211/driver-ops.c | 5 | ||||
| -rw-r--r-- | net/mac80211/rate.c | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/net/mac80211/driver-ops.c b/net/mac80211/driver-ops.c index c9a8a2433e8a..48322e45e7dd 100644 --- a/net/mac80211/driver-ops.c +++ b/net/mac80211/driver-ops.c @@ -125,8 +125,11 @@ int drv_sta_state(struct ieee80211_local *local, } else if (old_state == IEEE80211_STA_AUTH && new_state == IEEE80211_STA_ASSOC) { ret = drv_sta_add(local, sdata, &sta->sta); - if (ret == 0) + if (ret == 0) { sta->uploaded = true; + if (rcu_access_pointer(sta->sta.rates)) + drv_sta_rate_tbl_update(local, sdata, &sta->sta); + } } else if (old_state == IEEE80211_STA_ASSOC && new_state == IEEE80211_STA_AUTH) { drv_sta_remove(local, sdata, &sta->sta); diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c index b051f125d3af..9841db84bce0 100644 --- a/net/mac80211/rate.c +++ b/net/mac80211/rate.c @@ -934,7 +934,8 @@ int rate_control_set_rates(struct ieee80211_hw *hw, if (old) kfree_rcu(old, rcu_head); - drv_sta_rate_tbl_update(hw_to_local(hw), sta->sdata, pubsta); + if (sta->uploaded) + drv_sta_rate_tbl_update(hw_to_local(hw), sta->sdata, pubsta); ieee80211_sta_set_expected_throughput(pubsta, sta_get_expected_throughput(sta)); |