summaryrefslogtreecommitdiffstats
path: root/drivers/cdrom
diff options
context:
space:
mode:
authorEric Sesterhenn <snakebyte@gmx.de>2006-04-10 22:54:37 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-11 06:18:46 -0700
commitd93c2efc93f61c95808e303982f12fe6f5987270 (patch)
treedfb81b98ad65e8b1b27a8ed1d32e545cd4c0e8c2 /drivers/cdrom
parente60b6e2f747e94358fed9a23afd6abd738de4bf7 (diff)
downloadlinux-stable-d93c2efc93f61c95808e303982f12fe6f5987270.tar.gz
linux-stable-d93c2efc93f61c95808e303982f12fe6f5987270.tar.bz2
linux-stable-d93c2efc93f61c95808e303982f12fe6f5987270.zip
[PATCH] Overrun in cdrom/aztcd.c
This fixes coverity bug id #473. After the for loop i==16 if we didn't find a cdrom. So we should check for i==16 first before checking the array element. Signed-off-by: Eric Sesterhenn <snakebyte@gmx.de> Cc: Jens Axboe <axboe@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/cdrom')
-rw-r--r--drivers/cdrom/aztcd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cdrom/aztcd.c b/drivers/cdrom/aztcd.c
index ce4a1ce59d6a..ec004897b634 100644
--- a/drivers/cdrom/aztcd.c
+++ b/drivers/cdrom/aztcd.c
@@ -1763,7 +1763,7 @@ static int __init aztcd_init(void)
release_region(azt_port, 4);
}
}
- if ((azt_port_auto[i] == 0) || (i == 16)) {
+ if ((i == 16) || (azt_port_auto[i] == 0)) {
printk(KERN_INFO "aztcd: no AZTECH CD-ROM drive found\n");
return -EIO;
}