mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-29 22:02:02 +00:00
mac80211: handle lack of sband->bitrates in rates
[ Upstream commit 8b783d104e
]
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>
This commit is contained in:
parent
d2918cca64
commit
37f191b98e
2 changed files with 6 additions and 1 deletions
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue