88b9de105c
mac80211: do not call rate control .tx_status before .rate_init mwifiex: clear previous security setting during association ath9k: stop on rates with idx -1 in ath9k rate control's .tx_status ath9k_hw: prevent writes to const data on AR9160 rt2x00: fix a possible NULL pointer dereference iwlwifi: fix key removal mac80211: zero initialize count field in ieee80211_tx_rate mac80211: Fix a warning on changing to monitor mode from STA brcm80211: smac: fix endless retry of A-MPDU transmissions brcm80211: smac: only print block-ack timeout message at trace level
40 lines
1.6 KiB
Diff
40 lines
1.6 KiB
Diff
From 8617b093d0031837a7be9b32bc674580cfb5f6b5 Mon Sep 17 00:00:00 2001
|
|
From: Mohammed Shafi Shajakhan <mohammed@qca.qualcomm.com>
|
|
Date: Mon, 20 Feb 2012 10:05:31 +0530
|
|
Subject: [PATCH] mac80211: zero initialize count field in ieee80211_tx_rate
|
|
|
|
rate control algorithms concludes the rate as invalid
|
|
with rate[i].idx < -1 , while they do also check for rate[i].count is
|
|
non-zero. it would be safer to zero initialize the 'count' field.
|
|
recently we had a ath9k rate control crash where the ath9k rate control
|
|
in ath_tx_status assumed to check only for rate[i].count being non-zero
|
|
in one instance and ended up in using invalid rate index for
|
|
'connection monitoring NULL func frames' which eventually lead to the crash.
|
|
thanks to Pavel Roskin for fixing it and finding the root cause.
|
|
https://bugzilla.redhat.com/show_bug.cgi?id=768639
|
|
|
|
Cc: stable@vger.kernel.org
|
|
Cc: Pavel Roskin <proski@gnu.org>
|
|
Signed-off-by: Mohammed Shafi Shajakhan <mohammed@qca.qualcomm.com>
|
|
Signed-off-by: John W. Linville <linville@tuxdriver.com>
|
|
---
|
|
net/mac80211/rate.c | 2 +-
|
|
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
|
|
diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
|
|
index ad64f4d..f9b8e81 100644
|
|
--- a/net/mac80211/rate.c
|
|
+++ b/net/mac80211/rate.c
|
|
@@ -344,7 +344,7 @@ void rate_control_get_rate(struct ieee80211_sub_if_data *sdata,
|
|
for (i = 0; i < IEEE80211_TX_MAX_RATES; i++) {
|
|
info->control.rates[i].idx = -1;
|
|
info->control.rates[i].flags = 0;
|
|
- info->control.rates[i].count = 1;
|
|
+ info->control.rates[i].count = 0;
|
|
}
|
|
|
|
if (sdata->local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL)
|
|
--
|
|
1.7.4.4
|
|
|