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

Commit 7d969204 authored by Bob Copeland's avatar Bob Copeland Committed by John W. Linville
Browse files

ath5k: fix off-by-one in gpio checks 



Sanity checks against AR5K_NUM_GPIO were all broken.  This doesn't
currently cause any problems since we only use the first four gpios.

Changes-licensed-under: ISC

Reported-by: default avatarAndreas Mohr <andi@lisas.de>
Signed-off-by: default avatarBob Copeland <me@bobcopeland.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 63649b6c

drivers/net/wireless/ath5k/gpio.c

+5 −5
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ void ath5k_hw_set_ledstate(struct ath5k_hw *ah, unsigned int state) 
int ath5k_hw_set_gpio_input(struct ath5k_hw *ah, u32 gpio)

{

	ATH5K_TRACE(ah->ah_sc);

	if (gpio > AR5K_NUM_GPIO)

	if (gpio >= AR5K_NUM_GPIO)

		return -EINVAL;



	ath5k_hw_reg_write(ah,
@@ -99,7 +99,7 @@ int ath5k_hw_set_gpio_input(struct ath5k_hw *ah, u32 gpio) 
int ath5k_hw_set_gpio_output(struct ath5k_hw *ah, u32 gpio)

{

	ATH5K_TRACE(ah->ah_sc);

	if (gpio > AR5K_NUM_GPIO)

	if (gpio >= AR5K_NUM_GPIO)

		return -EINVAL;



	ath5k_hw_reg_write(ah,
@@ -115,7 +115,7 @@ int ath5k_hw_set_gpio_output(struct ath5k_hw *ah, u32 gpio) 
u32 ath5k_hw_get_gpio(struct ath5k_hw *ah, u32 gpio)

{

	ATH5K_TRACE(ah->ah_sc);

	if (gpio > AR5K_NUM_GPIO)

	if (gpio >= AR5K_NUM_GPIO)

		return 0xffffffff;



	/* GPIO input magic */
@@ -131,7 +131,7 @@ int ath5k_hw_set_gpio(struct ath5k_hw *ah, u32 gpio, u32 val) 
	u32 data;

	ATH5K_TRACE(ah->ah_sc);



	if (gpio > AR5K_NUM_GPIO)

	if (gpio >= AR5K_NUM_GPIO)

		return -EINVAL;



	/* GPIO output magic */
@@ -154,7 +154,7 @@ void ath5k_hw_set_gpio_intr(struct ath5k_hw *ah, unsigned int gpio, 
	u32 data;



	ATH5K_TRACE(ah->ah_sc);

	if (gpio > AR5K_NUM_GPIO)

	if (gpio >= AR5K_NUM_GPIO)

		return;



	/*