diff options
author | Reinette Chatre <reinette.chatre@intel.com> | 2010-02-26 14:01:36 -0500 |
---|---|---|
committer | Reinette Chatre <reinette.chatre@intel.com> | 2010-03-09 19:15:33 -0500 |
commit | 1d79e53c56afe0826a311c3bc1653ad938166c22 (patch) | |
tree | 99ea9db960129d1d30c3960f9375a25379e9c9a9 /drivers/net/wireless/iwlwifi/iwl-3945.c | |
parent | d88dca79d3852a3623f606f781e013d61486828a (diff) |
iwl3945: fix memory corruption
Recent patch "iwlwifi: move 3945 clip groups to 3945 data" exposed a memory
corruption problem. When initializing the clip groups the code was
mistakenly using the iwlagn rate count, not the 3945 rate count. This
resulted in more memory being written than was allocated.
"iwlwifi: move 3945 clip groups to 3945 data" moved the location where the
clip groups are stored and the impact is now severe in that the number of
configured TX queues is modified. Previously the
"temperature" field was overwritten, which did not seem to affect the
operation.
Fix this one instance where wrong rate count was used. I also noticed one
more location where the iwlagn rate count was used to index an iwl3945
array, fix this. I also modified one location that modified the iwlagn rate
count to obtain the iwl3945 rate count ... just use the iwl3945 rate count
directly.
This fixes http://bugzilla.intellinuxwireless.org/show_bug.cgi?id=2165 and
http://bugzilla.intellinuxwireless.org/show_bug.cgi?id=2168
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-3945.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-3945.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c index 303cc8193adc..e0678d921055 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945.c +++ b/drivers/net/wireless/iwlwifi/iwl-3945.c | |||
@@ -184,7 +184,7 @@ static int iwl3945_hwrate_to_plcp_idx(u8 plcp) | |||
184 | { | 184 | { |
185 | int idx; | 185 | int idx; |
186 | 186 | ||
187 | for (idx = 0; idx < IWL_RATE_COUNT; idx++) | 187 | for (idx = 0; idx < IWL_RATE_COUNT_3945; idx++) |
188 | if (iwl3945_rates[idx].plcp == plcp) | 188 | if (iwl3945_rates[idx].plcp == plcp) |
189 | return idx; | 189 | return idx; |
190 | return -1; | 190 | return -1; |
@@ -805,7 +805,7 @@ void iwl3945_hw_build_tx_cmd_rate(struct iwl_priv *priv, | |||
805 | int sta_id, int tx_id) | 805 | int sta_id, int tx_id) |
806 | { | 806 | { |
807 | u16 hw_value = ieee80211_get_tx_rate(priv->hw, info)->hw_value; | 807 | u16 hw_value = ieee80211_get_tx_rate(priv->hw, info)->hw_value; |
808 | u16 rate_index = min(hw_value & 0xffff, IWL_RATE_COUNT - 1); | 808 | u16 rate_index = min(hw_value & 0xffff, IWL_RATE_COUNT_3945); |
809 | u16 rate_mask; | 809 | u16 rate_mask; |
810 | int rate; | 810 | int rate; |
811 | u8 rts_retry_limit; | 811 | u8 rts_retry_limit; |
@@ -2146,7 +2146,7 @@ static void iwl3945_hw_reg_init_channel_groups(struct iwl_priv *priv) | |||
2146 | 2146 | ||
2147 | /* fill in channel group's nominal powers for each rate */ | 2147 | /* fill in channel group's nominal powers for each rate */ |
2148 | for (rate_index = 0; | 2148 | for (rate_index = 0; |
2149 | rate_index < IWL_RATE_COUNT; rate_index++, clip_pwrs++) { | 2149 | rate_index < IWL_RATE_COUNT_3945; rate_index++, clip_pwrs++) { |
2150 | switch (rate_index) { | 2150 | switch (rate_index) { |
2151 | case IWL_RATE_36M_INDEX_TABLE: | 2151 | case IWL_RATE_36M_INDEX_TABLE: |
2152 | if (i == 0) /* B/G */ | 2152 | if (i == 0) /* B/G */ |