evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

zd1211rw: fix potential array underflow

Browse source 
The first chunk fixes a debugging assert to print a warning about array underflows.
The second chunk corrects a potential array underflow.  I also removed an assert
in the second chunk because it can no longer happen.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Acked-by: Benoit Papillault <benoit.papillault@free.fr>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Dan Carpenter 2010-02-27 09:12:34 +03:00 • committed by John W. Linville
parent 3082a2b7b1
commit 86baf71229
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/net/wireless/zd1211rw/zd_mac.c
View file

@ -350,7 +350,7 @@ static void zd_mac_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb,
first_idx = info->status.rates[0].idx; first_idx = info->status.rates[0].idx;
ZD_ASSERT(0<=first_idx && first_idx<ARRAY_SIZE(zd_retry_rates)); ZD_ASSERT(0<=first_idx && first_idx<ARRAY_SIZE(zd_retry_rates));
retries = &zd_retry_rates[first_idx]; retries = &zd_retry_rates[first_idx];
ZD_ASSERT(0<=retry && retry<=retries->count); ZD_ASSERT(1 <= retry && retry <= retries->count);
info->status.rates[0].idx = retries->rate[0]; info->status.rates[0].idx = retries->rate[0];
info->status.rates[0].count = 1; // (retry > 1 ? 2 : 1); info->status.rates[0].count = 1; // (retry > 1 ? 2 : 1);
@ -424,11 +424,9 @@ void zd_mac_tx_failed(struct urb *urb)
first_idx = info->status.rates[0].idx; first_idx = info->status.rates[0].idx;
ZD_ASSERT(0<=first_idx && first_idx<ARRAY_SIZE(zd_retry_rates)); ZD_ASSERT(0<=first_idx && first_idx<ARRAY_SIZE(zd_retry_rates));
retries = &zd_retry_rates[first_idx]; retries = &zd_retry_rates[first_idx];
if (retry < 0 || retry > retries->count) { if (retry <= 0 || retry > retries->count)
continue; continue;
}
ZD_ASSERT(0<=retry && retry<=retries->count);
final_idx = retries->rate[retry - 1]; final_idx = retries->rate[retry - 1];
final_rate = zd_rates[final_idx].hw_value; final_rate = zd_rates[final_idx].hw_value;