We have a single bugfix for an invalid memory read.
-----BEGIN PGP SIGNATURE----- iQIcBAABCAAGBQJVzc58AAoJEDBSmw7B7bqrhkQP/1bgnJHOtAthUygVCUDN3p6J rbmyfmszcWqPgYWMh4sfBRJQPWBpq4Q4ZPlVNCU8VkFoJRXemqWsOjnpMro0Vi8Y omTMPf1ph5WAUhCTjR6d+J7M5uHVzp1ougeaDEHY6QPTQ0rNTQ4W9gR+TFRSSTG2 gVIuledUXQgkBW6nm3mT3bxSwMkK6PnPy6Dpkzm4VFt3JtO0ZpSV+RzMLifmNf1r 25lYiUUyimWbJGvZCMV9O2qKWwb+9AIYrItW74yUV2dRqqBZmP+IqJQ2p2mTWcjE YBToZA5Yrd6iSfuKC/wd2kt3NkmsGdNGwFSy4tI6WjBkKKLygOKBvcpBzcNDgv06 ZB4mcyfac+KPiDA1QFvwV+OrU1u63wWDyfjkGCVkoq6WJkUxUZ4JVOq/7LolrxK8 d0mJojOMjTlr2Q+7KMINl9HDw0MhkYqY/fJv+AHOlcIGc2bVrJF0n9fWsc9gKdPu c+2lIJLxzuojapXJXj+XpF6iPjh92F83W6iPbXZfu6AzvYQwGwve87CckurwElYY bCDV0nXzmn5DYwEOuKtiflbmLW0qlXbjhX27B4yHmXsS3/Q7M/pMUy3mj4pchmxn Iwr8pVoCgn8Z1hDJvyYPb4l0ERjY/MZghBJg+Yp4Q7CEWGOmyIPdi0visA9FN/xk ekOYrjW9Jz3AlgMDPVCC =uehl -----END PGP SIGNATURE----- Merge tag 'mac80211-for-davem-2015-08-14' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211 Johannes Berg says: ==================== We have a single bugfix for an invalid memory read. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
a27cc68b9b
|
@ -92,14 +92,15 @@ int minstrel_get_tp_avg(struct minstrel_rate *mr, int prob_ewma)
|
||||||
static inline void
|
static inline void
|
||||||
minstrel_sort_best_tp_rates(struct minstrel_sta_info *mi, int i, u8 *tp_list)
|
minstrel_sort_best_tp_rates(struct minstrel_sta_info *mi, int i, u8 *tp_list)
|
||||||
{
|
{
|
||||||
int j = MAX_THR_RATES;
|
int j;
|
||||||
struct minstrel_rate_stats *tmp_mrs = &mi->r[j - 1].stats;
|
struct minstrel_rate_stats *tmp_mrs;
|
||||||
struct minstrel_rate_stats *cur_mrs = &mi->r[i].stats;
|
struct minstrel_rate_stats *cur_mrs = &mi->r[i].stats;
|
||||||
|
|
||||||
while (j > 0 && (minstrel_get_tp_avg(&mi->r[i], cur_mrs->prob_ewma) >
|
for (j = MAX_THR_RATES; j > 0; --j) {
|
||||||
minstrel_get_tp_avg(&mi->r[tp_list[j - 1]], tmp_mrs->prob_ewma))) {
|
|
||||||
j--;
|
|
||||||
tmp_mrs = &mi->r[tp_list[j - 1]].stats;
|
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)
|
if (j < MAX_THR_RATES - 1)
|
||||||
|
|
Loading…
Reference in a new issue