Commit ef01cee2 authored by Jeremy Kerr's avatar Jeremy Kerr Committed by David S. Miller

net: bmac: Fix read of MAC address from ROM

In bmac_get_station_address, We're reading two bytes at a time from ROM,
but we do that six times, resulting in 12 bytes of read & writes. This
means we will write off the end of the six-byte destination buffer.

This change fixes the for-loop to only read/write six bytes.

Based on a proposed fix from Finn Thain <fthain@telegraphics.com.au>.
Signed-off-by: default avatarJeremy Kerr <jk@ozlabs.org>
Reported-by: default avatarStan Johnson <userm57@yahoo.com>
Tested-by: default avatarStan Johnson <userm57@yahoo.com>
Reported-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b15e6263
...@@ -1182,7 +1182,7 @@ bmac_get_station_address(struct net_device *dev, unsigned char *ea) ...@@ -1182,7 +1182,7 @@ bmac_get_station_address(struct net_device *dev, unsigned char *ea)
int i; int i;
unsigned short data; unsigned short data;
for (i = 0; i < 6; i++) for (i = 0; i < 3; i++)
{ {
reset_and_select_srom(dev); reset_and_select_srom(dev);
data = read_srom(dev, i + EnetAddressOffset/2, SROMAddressBits); data = read_srom(dev, i + EnetAddressOffset/2, SROMAddressBits);
......
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