]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
mac80211: Check rate->idx before rate->count
authorHelmut Schaa <helmut.schaa@googlemail.com>
Mon, 14 Nov 2011 14:28:19 +0000 (15:28 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 17 Nov 2011 20:43:56 +0000 (15:43 -0500)
The drivers are not required to fill in rate->count if rate->idx is set
to -1. Hence, we should first check rate->idx before accessing
rate->count.

Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
Acked-by: Felix Fietkau <nbd@openwrt.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
net/mac80211/rc80211_minstrel_ht.c

index cdb28535716b14d907d6423578c10db604d9c43f..972244f83c0d37b08d30ca64227ecaf774d70b97 100644 (file)
@@ -300,10 +300,10 @@ minstrel_ht_update_stats(struct minstrel_priv *mp, struct minstrel_ht_sta *mi)
 static bool
 minstrel_ht_txstat_valid(struct ieee80211_tx_rate *rate)
 {
-       if (!rate->count)
+       if (rate->idx < 0)
                return false;
 
-       if (rate->idx < 0)
+       if (!rate->count)
                return false;
 
        return !!(rate->flags & IEEE80211_TX_RC_MCS);