diff options
| author | roel kluin <roel.kluin@gmail.com> | 2009-07-29 03:18:56 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-07-30 13:27:34 -0700 |
| commit | f0c5b35c6c93c89a9d8ccab19b0b4842f5dfddc5 (patch) | |
| tree | 435e5f63d7f6dc4f822af6e5d3cca35e0218984b /drivers | |
| parent | a3e8ee682003685b8b9c98c89340a42e48c3e813 (diff) | |
| download | blackbird-op-linux-f0c5b35c6c93c89a9d8ccab19b0b4842f5dfddc5.tar.gz blackbird-op-linux-f0c5b35c6c93c89a9d8ccab19b0b4842f5dfddc5.zip | |
eexpress: Read buffer overflow
start_code is 69 words, but the code always writes a multiple of 16 words,
so the last 11 words written are outside the array.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/eexpress.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c index 1686dca28748..1f016d66684a 100644 --- a/drivers/net/eexpress.c +++ b/drivers/net/eexpress.c @@ -1474,13 +1474,13 @@ static void eexp_hw_init586(struct net_device *dev) outw(0x0000, ioaddr + 0x800c); outw(0x0000, ioaddr + 0x800e); - for (i = 0; i < (sizeof(start_code)); i+=32) { + for (i = 0; i < ARRAY_SIZE(start_code) * 2; i+=32) { int j; outw(i, ioaddr + SM_PTR); - for (j = 0; j < 16; j+=2) + for (j = 0; j < 16 && (i+j)/2 < ARRAY_SIZE(start_code); j+=2) outw(start_code[(i+j)/2], ioaddr+0x4000+j); - for (j = 0; j < 16; j+=2) + for (j = 0; j < 16 && (i+j+16)/2 < ARRAY_SIZE(start_code); j+=2) outw(start_code[(i+j+16)/2], ioaddr+0x8000+j); } |
