2020-05-19 01:11:22

by Jeremy Kerr

Subject: [PATCH] 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 <[email protected]>.

Signed-off-by: Jeremy Kerr <[email protected]>
Reported-by: Stan Johnson <[email protected]>
Tested-by: Stan Johnson <[email protected]>
Reported-by: Finn Thain <[email protected]>
---
drivers/net/ethernet/apple/bmac.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/apple/bmac.c b/drivers/net/ethernet/apple/bmac.c
index a58185b1d8bf..3e3711b60d01 100644
--- a/drivers/net/ethernet/apple/bmac.c
+++ b/drivers/net/ethernet/apple/bmac.c
@@ -1182,7 +1182,7 @@ bmac_get_station_address(struct net_device *dev, unsigned char *ea)
int i;
unsigned short data;

- for (i = 0; i < 6; i++)
+ for (i = 0; i < 3; i++)
{
reset_and_select_srom(dev);
data = read_srom(dev, i + EnetAddressOffset/2, SROMAddressBits);
--
2.17.1

2020-05-19 19:06:23

by David Miller

Subject: Re: [PATCH] net: bmac: Fix read of MAC address from ROM

From: Jeremy Kerr <[email protected]>
Date: Tue, 19 May 2020 09:05:58 +0800

> 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 <[email protected]>.
>
> Signed-off-by: Jeremy Kerr <[email protected]>
> Reported-by: Stan Johnson <[email protected]>
> Tested-by: Stan Johnson <[email protected]>
> Reported-by: Finn Thain <[email protected]>

Applied, thanks.