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

Commit 05e8594d authored by Dan Carpenter's avatar Dan Carpenter Committed by John W. Linville
Browse files

ath5k: several off by one range checks 



There are several places that use > ARRAY_SIZE() instead of
>= ARRAY_SIZE().

Signed-off-by: default avatarDan Carpenter <error27@gmail.com>
Acked-by: default avatarBob Copeland <me@bobcopeland.com>
Acked-by: default avatarBruno Randolf <br1@einfach.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 0730d114

drivers/net/wireless/ath/ath5k/ani.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -73,7 +73,7 @@ ath5k_ani_set_noise_immunity_level(struct ath5k_hw *ah, int level) 
	const s8 hi[] = { -14, -12 };

	const s8 hi[] = { -14, -12 };

	const s8 fr[] = { -78, -80 };

	const s8 fr[] = { -78, -80 };

#endif

#endif

	if (level < 0 || level > ARRAY_SIZE(sz)) {

	if (level < 0 || level >= ARRAY_SIZE(sz)) {

		ATH5K_DBG_UNLIMIT(ah->ah_sc, ATH5K_DEBUG_ANI,

		ATH5K_DBG_UNLIMIT(ah->ah_sc, ATH5K_DEBUG_ANI,

			"level out of range %d", level);

			"level out of range %d", level);

		return;

		return;
@@ -104,7 +104,7 @@ ath5k_ani_set_spur_immunity_level(struct ath5k_hw *ah, int level) 
{

{

	const int val[] = { 2, 4, 6, 8, 10, 12, 14, 16 };

	const int val[] = { 2, 4, 6, 8, 10, 12, 14, 16 };





	if (level < 0 || level > ARRAY_SIZE(val) ||

	if (level < 0 || level >= ARRAY_SIZE(val) ||

	    level > ah->ah_sc->ani_state.max_spur_level) {

	    level > ah->ah_sc->ani_state.max_spur_level) {

		ATH5K_DBG_UNLIMIT(ah->ah_sc, ATH5K_DEBUG_ANI,

		ATH5K_DBG_UNLIMIT(ah->ah_sc, ATH5K_DEBUG_ANI,

			"level out of range %d", level);

			"level out of range %d", level);
@@ -129,7 +129,7 @@ ath5k_ani_set_firstep_level(struct ath5k_hw *ah, int level) 
{

{

	const int val[] = { 0, 4, 8 };

	const int val[] = { 0, 4, 8 };





	if (level < 0 || level > ARRAY_SIZE(val)) {

	if (level < 0 || level >= ARRAY_SIZE(val)) {

		ATH5K_DBG_UNLIMIT(ah->ah_sc, ATH5K_DEBUG_ANI,

		ATH5K_DBG_UNLIMIT(ah->ah_sc, ATH5K_DEBUG_ANI,

			"level out of range %d", level);

			"level out of range %d", level);

		return;

		return;