Commit 8abb9bed authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Greg Kroah-Hartman

[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.
Signed-off-by: default avatarStephen Hemminger <shemminger@osdl.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 905ea118
...@@ -579,8 +579,8 @@ static void sky2_mac_init(struct sky2_hw *hw, unsigned port) ...@@ -579,8 +579,8 @@ static void sky2_mac_init(struct sky2_hw *hw, unsigned port)
reg = gma_read16(hw, port, GM_PHY_ADDR); reg = gma_read16(hw, port, GM_PHY_ADDR);
gma_write16(hw, port, GM_PHY_ADDR, reg | GM_PAR_MIB_CLR); gma_write16(hw, port, GM_PHY_ADDR, reg | GM_PAR_MIB_CLR);
for (i = 0; i < GM_MIB_CNT_SIZE; i++) for (i = GM_MIB_CNT_BASE; i <= GM_MIB_CNT_END; i += 4)
gma_read16(hw, port, GM_MIB_CNT_BASE + 8 * i); gma_read16(hw, port, i);
gma_write16(hw, port, GM_PHY_ADDR, reg); gma_write16(hw, port, GM_PHY_ADDR, reg);
/* transmit control */ /* transmit control */
......
...@@ -1380,6 +1380,7 @@ enum { ...@@ -1380,6 +1380,7 @@ enum {
/* MIB Counters */ /* MIB Counters */
#define GM_MIB_CNT_BASE 0x0100 /* Base Address of MIB Counters */ #define GM_MIB_CNT_BASE 0x0100 /* Base Address of MIB Counters */
#define GM_MIB_CNT_SIZE 44 /* Number of MIB Counters */ #define GM_MIB_CNT_SIZE 44 /* Number of MIB Counters */
#define GM_MIB_CNT_END 0x025C /* Last MIB counter */
/* /*
* MIB Counters base address definitions (low word) - * MIB Counters base address definitions (low word) -
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment