summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroel kluin <roel.kluin@gmail.com>2009-07-25 14:38:33 +0200
committerDavid S. Miller <davem@davemloft.net>2009-07-27 03:50:39 +0200
commitc65d3198addb1a2862d4b88bc2a74ac9cbed66f9 (patch)
tree03d4d23ff834aea7ba637860aea0a604924a2bc6
parentat1700: Read buffer overflow (diff)
downloadlinux-c65d3198addb1a2862d4b88bc2a74ac9cbed66f9.tar.xz
linux-c65d3198addb1a2862d4b88bc2a74ac9cbed66f9.zip
tokenring: Read buffer overflow
io[i] is read before the bounds check on i, order should be reversed Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/tokenring/ibmtr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/tokenring/ibmtr.c b/drivers/net/tokenring/ibmtr.c
index 9d896116cf76..08a6c41c1599 100644
--- a/drivers/net/tokenring/ibmtr.c
+++ b/drivers/net/tokenring/ibmtr.c
@@ -1912,7 +1912,7 @@ static int __init ibmtr_init(void)
find_turbo_adapters(io);
- for (i = 0; io[i] && (i < IBMTR_MAX_ADAPTERS); i++) {
+ for (i = 0; i < IBMTR_MAX_ADAPTERS && io[i]; i++) {
struct net_device *dev;
irq[i] = 0;
mem[i] = 0;