Commit c5e534e5 authored by Jiri Slaby's avatar Jiri Slaby Committed by John W. Linville
Browse files

NET: ath5k, check ath5k_eeprom_mode_from_channel retval

It can, if invalid argument given, return a negative value. In that
case we would access arrays out-of-bounds and such. Check the value
and yell loudly if that happened as it would be a bug in the
implementation. (Instead of silently corrupting memory.)
Signed-off-by: default avatarJiri Slaby <>
Cc: Nick Kossifidis <>
Cc: "Luis R. Rodriguez" <>
Signed-off-by: default avatarJohn W. Linville <>
parent 957f4aca
......@@ -1613,6 +1613,10 @@ ath5k_hw_update_noise_floor(struct ath5k_hw *ah)
ah->ah_cal_mask |= AR5K_CALIBRATION_NF;
ee_mode = ath5k_eeprom_mode_from_channel(ah->ah_current_channel);
if (WARN_ON(ee_mode < 0)) {
ah->ah_cal_mask &= ~AR5K_CALIBRATION_NF;
/* completed NF calibration, test threshold */
nf = ath5k_hw_read_measured_noise_floor(ah);
......@@ -985,6 +985,8 @@ ath5k_hw_commit_eeprom_settings(struct ath5k_hw *ah,
ee_mode = ath5k_eeprom_mode_from_channel(channel);
if (WARN_ON(ee_mode < 0))
/* Adjust power delta for channel 14 */
if (channel->center_freq == 2484)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment