diff options
author | Adrian Bunk <bunk@kernel.org> | 2007-10-14 13:51:15 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2007-10-18 15:44:42 -0400 |
commit | c899a575fa9cc802a4a77f6c5078b14fc1d12487 (patch) | |
tree | 0dc2c257d8c259b5bcdc345db74ff30349555d88 /drivers/net/wireless/iwlwifi/iwl4965-base.c | |
parent | ba8007ceb076f336a453a049cc5353eaa01d7136 (diff) |
[PATCH] iwl4965-base.c: fix off-by-one errors
This patch fixes two off-by-one errors resulting in array overflows
spotted by the Coverity checker.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl4965-base.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl4965-base.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c index 7b0c602082b1..acdf5507d3d0 100644 --- a/drivers/net/wireless/iwlwifi/iwl4965-base.c +++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c | |||
@@ -4492,13 +4492,13 @@ static u8 ratio2dB[100] = { | |||
4492 | * Conversion assumes that levels are voltages (20*log), not powers (10*log). */ | 4492 | * Conversion assumes that levels are voltages (20*log), not powers (10*log). */ |
4493 | int iwl_calc_db_from_ratio(int sig_ratio) | 4493 | int iwl_calc_db_from_ratio(int sig_ratio) |
4494 | { | 4494 | { |
4495 | /* Anything above 1000:1 just report as 60 dB */ | 4495 | /* 1000:1 or higher just report as 60 dB */ |
4496 | if (sig_ratio > 1000) | 4496 | if (sig_ratio >= 1000) |
4497 | return 60; | 4497 | return 60; |
4498 | 4498 | ||
4499 | /* Above 100:1, divide by 10 and use table, | 4499 | /* 100:1 or higher, divide by 10 and use table, |
4500 | * add 20 dB to make up for divide by 10 */ | 4500 | * add 20 dB to make up for divide by 10 */ |
4501 | if (sig_ratio > 100) | 4501 | if (sig_ratio >= 100) |
4502 | return (20 + (int)ratio2dB[sig_ratio/10]); | 4502 | return (20 + (int)ratio2dB[sig_ratio/10]); |
4503 | 4503 | ||
4504 | /* We shouldn't see this */ | 4504 | /* We shouldn't see this */ |