aboutsummaryrefslogtreecommitdiffstats
path: root/src/drivers/bus
diff options
context:
space:
mode:
authorMichael Brown <mcb30@etherboot.org>2005-04-22 12:02:34 +0000
committerMichael Brown <mcb30@etherboot.org>2005-04-22 12:02:34 +0000
commitfeb652709d7c1a3166ef53e2f80b6955bfaa2073 (patch)
treeb9e215bd6b33d8b2778646b12db274c18ffd60bc /src/drivers/bus
parente596c42adeb8c5dd73e5494a7acd2cd75328ff08 (diff)
downloadipxe-feb652709d7c1a3166ef53e2f80b6955bfaa2073.tar.gz
Must not go beyond end of driver's probe list.
Diffstat (limited to 'src/drivers/bus')
-rw-r--r--src/drivers/bus/isa.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/drivers/bus/isa.c b/src/drivers/bus/isa.c
index 9c5b4efdf..95701c36b 100644
--- a/src/drivers/bus/isa.c
+++ b/src/drivers/bus/isa.c
@@ -100,8 +100,11 @@ int isa_check_driver ( struct bus_dev *bus_dev,
/* If ioaddr is zero, it means we're using a driver-specified
* ioaddr
*/
- if ( ! isa->ioaddr )
+ if ( ! isa->ioaddr ) {
+ if ( isa->driver_probe_idx >= driver->addr_count )
+ return 0;
isa->ioaddr = driver->probe_addrs[isa->driver_probe_idx];
+ }
/* Use probe_addr method to see if there's a device
* present at this address.