Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86baf712 authored by Dan Carpenter's avatar Dan Carpenter Committed by John W. Linville
Browse files

zd1211rw: fix potential array underflow 



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: default avatarDan Carpenter <error27@gmail.com>
Acked-by: default avatarBenoit Papillault <benoit.papillault@free.fr>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3082a2b7

drivers/net/wireless/zd1211rw/zd_mac.c

+4 −6
Original line number Diff line number Diff line
@@ -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;

	ZD_ASSERT(0<=first_idx && first_idx<ARRAY_SIZE(zd_retry_rates));

	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].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;

		ZD_ASSERT(0<=first_idx && first_idx<ARRAY_SIZE(zd_retry_rates));

		retries = &zd_retry_rates[first_idx];

		if (retry < 0 || retry > retries->count) {

		if (retry <= 0 || retry > retries->count)

			continue;

		}



		ZD_ASSERT(0<=retry && retry<=retries->count);

		final_idx = retries->rate[retry - 1];

		final_rate = zd_rates[final_idx].hw_value;