diff options
| author |   Dan Carpenter <dan.carpenter@oracle.com> | 2019-11-26 15:09:39 +0300 |
|---|---|---|
| committer |   Johannes Berg <johannes.berg@intel.com> | 2019-12-13 10:08:22 +0100 |
| commit | e548f749b096133d6da3dd7235ecfc6bd67be306 (patch) | |
| tree | 51dbad78a68b44786e9f937b9ee0dbaf9c64bc98 /net | |
| parent | cfg80211: fix double-free after changing network namespace (diff) | |
| download | linux-dev-e548f749b096133d6da3dd7235ecfc6bd67be306.tar.xz linux-dev-e548f749b096133d6da3dd7235ecfc6bd67be306.zip | |
mac80211: airtime: Fix an off by one in ieee80211_calc_rx_airtime()
This code was copied from mt76 and inherited an off by one bug from
there. The > should be >= so that we don't read one element beyond
the end of the array.
Fixes: db3e1c40cf2f ("mac80211: Import airtime calculation code from mt76")
Reported-by: Toke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Toke Høiland-Jørgensen <toke@redhat.com>
Link: https://lore.kernel.org/r/20191126120910.ftr4t7me3by32aiz@kili.mountain
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/airtime.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/airtime.c b/net/mac80211/airtime.c index 63cb0028b02d..9fc2968856c0 100644 --- a/net/mac80211/airtime.c +++ b/net/mac80211/airtime.c @@ -442,7 +442,7 @@ u32 ieee80211_calc_rx_airtime(struct ieee80211_hw *hw, return 0; sband = hw->wiphy->bands[status->band]; - if (!sband || status->rate_idx > sband->n_bitrates) + if (!sband || status->rate_idx >= sband->n_bitrates) return 0; rate = &sband->bitrates[status->rate_idx]; |