diff options
author | Adrian Bunk <bunk@kernel.org> | 2007-11-14 19:59:02 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-14 21:45:38 -0500 |
commit | a9e60e5c3c4721dd216047e4c58c4eb89789f519 (patch) | |
tree | 889d05f1bcee8050500274f6ce695d038ee8c744 /drivers/video/sis/sis_main.c | |
parent | 43054412db5e5b3eda1eff6c2245ff4257560340 (diff) |
video/sis/: fix negative array index
This patch fixes the possible usage of a negative value as an array
index spotted by the Coverity checker.
sisfb_validate_mode() could return a negative error code and we must check for
that prior to using its return value as an array index.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Cc: Thomas Winischhofer <thomas@winischhofer.net>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/sis/sis_main.c')
-rw-r--r-- | drivers/video/sis/sis_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/sis/sis_main.c b/drivers/video/sis/sis_main.c index bc7d23683735..37bd24b8d83b 100644 --- a/drivers/video/sis/sis_main.c +++ b/drivers/video/sis/sis_main.c | |||
@@ -1248,7 +1248,6 @@ sisfb_do_set_var(struct fb_var_screeninfo *var, int isactive, struct fb_info *in | |||
1248 | if(found_mode) { | 1248 | if(found_mode) { |
1249 | ivideo->sisfb_mode_idx = sisfb_validate_mode(ivideo, | 1249 | ivideo->sisfb_mode_idx = sisfb_validate_mode(ivideo, |
1250 | ivideo->sisfb_mode_idx, ivideo->currentvbflags); | 1250 | ivideo->sisfb_mode_idx, ivideo->currentvbflags); |
1251 | ivideo->mode_no = sisbios_mode[ivideo->sisfb_mode_idx].mode_no[ivideo->mni]; | ||
1252 | } else { | 1251 | } else { |
1253 | ivideo->sisfb_mode_idx = -1; | 1252 | ivideo->sisfb_mode_idx = -1; |
1254 | } | 1253 | } |
@@ -1260,6 +1259,8 @@ sisfb_do_set_var(struct fb_var_screeninfo *var, int isactive, struct fb_info *in | |||
1260 | return -EINVAL; | 1259 | return -EINVAL; |
1261 | } | 1260 | } |
1262 | 1261 | ||
1262 | ivideo->mode_no = sisbios_mode[ivideo->sisfb_mode_idx].mode_no[ivideo->mni]; | ||
1263 | |||
1263 | if(sisfb_search_refresh_rate(ivideo, ivideo->refresh_rate, ivideo->sisfb_mode_idx) == 0) { | 1264 | if(sisfb_search_refresh_rate(ivideo, ivideo->refresh_rate, ivideo->sisfb_mode_idx) == 0) { |
1264 | ivideo->rate_idx = sisbios_mode[ivideo->sisfb_mode_idx].rate_idx; | 1265 | ivideo->rate_idx = sisbios_mode[ivideo->sisfb_mode_idx].rate_idx; |
1265 | ivideo->refresh_rate = 60; | 1266 | ivideo->refresh_rate = 60; |