Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2718d6e8 authored by Felix Fietkau's avatar Felix Fietkau Committed by Greg Kroah-Hartman
Browse files

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: default avatarFelix 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: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a3bcb11e

net/mac80211/driver-ops.c

+4 −1
Original line number Diff line number Diff line
@@ -128,8 +128,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);

net/mac80211/rate.c

+2 −1
Original line number Diff line number Diff line
@@ -892,6 +892,7 @@ int rate_control_set_rates(struct ieee80211_hw *hw, 
	if (old)

		kfree_rcu(old, rcu_head);



	if (sta->uploaded)

		drv_sta_rate_tbl_update(hw_to_local(hw), sta->sdata, pubsta);



	return 0;