mac80211: handle lack of sband->bitrates in rates

[ Upstream commit 8b783d104e7f40684333d2ec155fac39219beb2f ]

Even though a driver or mac80211 shouldn't produce a
legacy bitrate if sband->bitrates doesn't exist, don't
crash if that is the case either.

This fixes a kernel panic if station dump is run before
last_rate can be updated with a data frame when
sband->bitrates is missing (eg. in S1G bands).

Signed-off-by: Thomas Pedersen <thomas@adapt-ip.com>
Link: https://lore.kernel.org/r/20201005164522.18069-1-thomas@adapt-ip.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index c883cb67b73112f9758a47d5bc23875b72828df1..0b82d8da4ab0a7c0cc177839860cccbe2bdaa21c 100644 (file)
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -661,7 +661,8 @@ void sta_set_rate_info_tx(struct sta_info *sta,
                u16 brate;
 
                sband = ieee80211_get_sband(sta->sdata);
-               if (sband) {
+               WARN_ON_ONCE(sband && !sband->bitrates);
+               if (sband && sband->bitrates) {
                        brate = sband->bitrates[rate->idx].bitrate;
                        rinfo->legacy = DIV_ROUND_UP(brate, 1 << shift);
                }

diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index 6af5fda6461ce8d6f4a3dff5dd7716a4de9b4bbe..2a18687019003728d51861d2a900ca375919139f 100644 (file)
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -2004,6 +2004,10 @@ static void sta_stats_decode_rate(struct ieee80211_local *local, u16 rate,
 
                rinfo->flags = 0;
                sband = local->hw.wiphy->bands[band];
+
+               if (WARN_ON_ONCE(!sband->bitrates))
+                       break;
+
                brate = sband->bitrates[rate_idx].bitrate;
                if (rinfo->bw == RATE_INFO_BW_5)
                        shift = 2;