From: Michael Brown <mcb30@etherboot.org>
Date: Fri, 22 Apr 2005 12:02:34 +0000 (+0000)
Subject: Must not go beyond end of driver's probe list.
X-Git-Tag: v0.9.3~1841
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=feb652709d7c1a3166ef53e2f80b6955bfaa2073;p=thirdparty%2Fipxe.git

Must not go beyond end of driver's probe list.
---

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.