[PATCH wireless-next 1/2] wifi: mac80211: fix RCU dereference in throughput estimate

From: Johannes Berg <[email protected]>

This is invoked with the wiphy mutex held, not in an RCU
critical section, fix the dereference accordingly.

Fixes: 2f925427e27a ("wifi: mac80211: estimate expected throughput if not provided by driver/rc")
Signed-off-by: Johannes Berg <[email protected]>
---
 net/mac80211/sta_info.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index a1759eba7b01..b380e3b3c044 100644
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -2834,7 +2834,7 @@ static u32 sta_estimate_expected_throughput(struct sta_info *sta,
 	u32 duration;
 	u8 band;
 
-	conf = rcu_dereference(bss_conf->chanctx_conf);
+	conf = sdata_dereference(bss_conf->chanctx_conf, sta->sdata);
 	if (!conf)
 		return 0;
 	band = conf->def.chan->band;
-- 
2.55.0