Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43f2f104 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Jeff Garzik
Browse files

[PATCH] sky2: bad memory reference on dual port cards 



Sky2 driver will oops referencing bad memory if used on
a dual port card.  The problem is accessing past end of
MIB counter space.

Applies for both 2.6.17 and 2.6.16 (with fuzz)

Signed-off-by: default avatarStephen Hemminger <shemminger@osdl.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 94843566

drivers/net/sky2.c

+2 −2
Original line number Diff line number Diff line
@@ -577,8 +577,8 @@ static void sky2_mac_init(struct sky2_hw *hw, unsigned port) 
	reg = gma_read16(hw, port, GM_PHY_ADDR);

	gma_write16(hw, port, GM_PHY_ADDR, reg | GM_PAR_MIB_CLR);



	for (i = 0; i < GM_MIB_CNT_SIZE; i++)

		gma_read16(hw, port, GM_MIB_CNT_BASE + 8 * i);

	for (i = GM_MIB_CNT_BASE; i <= GM_MIB_CNT_END; i += 4)

		gma_read16(hw, port, i);

	gma_write16(hw, port, GM_PHY_ADDR, reg);



	/* transmit control */

drivers/net/sky2.h

+1 −1
Original line number Diff line number Diff line
@@ -1375,7 +1375,7 @@ enum { 
	GM_PHY_ADDR	= 0x0088,	/* 16 bit r/w	GPHY Address Register */

/* MIB Counters */

	GM_MIB_CNT_BASE	= 0x0100,	/* Base Address of MIB Counters */

	GM_MIB_CNT_SIZE	= 256,

	GM_MIB_CNT_END	= 0x025C,	/* Last MIB counter */

};