Author: nbd Date: 2015-07-31 21:49:17 +0200 (Fri, 31 Jul 2015) New Revision: 46533
Added: trunk/package/kernel/mac80211/patches/310-mac80211-fix-invalid-read-in-minstrel_sort_best_tp_r.patch Log: mac80211: fix an invalid read in minstrel rate sorting Signed-off-by: Felix Fietkau <[email protected]> Added: trunk/package/kernel/mac80211/patches/310-mac80211-fix-invalid-read-in-minstrel_sort_best_tp_r.patch =================================================================== --- trunk/package/kernel/mac80211/patches/310-mac80211-fix-invalid-read-in-minstrel_sort_best_tp_r.patch (rev 0) +++ trunk/package/kernel/mac80211/patches/310-mac80211-fix-invalid-read-in-minstrel_sort_best_tp_r.patch 2015-07-31 19:49:17 UTC (rev 46533) @@ -0,0 +1,34 @@ +From: Adrien Schildknecht <[email protected]> +Date: Tue, 28 Jul 2015 10:30:16 +0200 +Subject: [PATCH] mac80211: fix invalid read in minstrel_sort_best_tp_rates() + +At the last iteration of the loop, j may equal zero and thus +tp_list[j - 1] causes an invalid read. +Changed the logic of the loop so that j - 1 is always >= 0. + +Signed-off-by: Adrien Schildknecht <[email protected]> +--- + +--- a/net/mac80211/rc80211_minstrel.c ++++ b/net/mac80211/rc80211_minstrel.c +@@ -92,14 +92,15 @@ int minstrel_get_tp_avg(struct minstrel_ + static inline void + minstrel_sort_best_tp_rates(struct minstrel_sta_info *mi, int i, u8 *tp_list) + { +- int j = MAX_THR_RATES; +- struct minstrel_rate_stats *tmp_mrs = &mi->r[j - 1].stats; ++ int j; ++ struct minstrel_rate_stats *tmp_mrs; + struct minstrel_rate_stats *cur_mrs = &mi->r[i].stats; + +- while (j > 0 && (minstrel_get_tp_avg(&mi->r[i], cur_mrs->prob_ewma) > +- minstrel_get_tp_avg(&mi->r[tp_list[j - 1]], tmp_mrs->prob_ewma))) { +- j--; ++ for (j = MAX_THR_RATES; j > 0; --j) { + tmp_mrs = &mi->r[tp_list[j - 1]].stats; ++ if (minstrel_get_tp_avg(&mi->r[i], cur_mrs->prob_ewma) <= ++ minstrel_get_tp_avg(&mi->r[tp_list[j - 1]], tmp_mrs->prob_ewma)) ++ break; + } + + if (j < MAX_THR_RATES - 1) _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
