diff options
| author | Heiner Kallweit | 2018-05-02 21:39:59 +0200 |
|---|---|---|
| committer | David S. Miller | 2018-05-02 22:23:49 +0200 |
| commit | 353af85ed811d84ca349c6d6e5df8055eeab5bd5 (patch) | |
| tree | d67ae48b68eb714455252d318b4c6eb5e508c777 /drivers/net/ethernet | |
| parent | r8169: improve PCI config space access (diff) | |
| download | kernel-qcow2-linux-353af85ed811d84ca349c6d6e5df8055eeab5bd5.tar.gz kernel-qcow2-linux-353af85ed811d84ca349c6d6e5df8055eeab5bd5.tar.xz kernel-qcow2-linux-353af85ed811d84ca349c6d6e5df8055eeab5bd5.zip | |
r8169: avoid potentially misaligned access when getting mac address
Interpreting a member of an u16 array as u32 may result in a misaligned
access. Also it's not really intuitive to define a mac address variable
as array of three u16 words. Therefore use an array of six bytes that
is properly aligned for 32 bit access.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index d72b3fdf853a..6fce3cc86ae3 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -7767,14 +7767,14 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) /* Get MAC address */ switch (tp->mac_version) { - u16 mac_addr[3]; + u8 mac_addr[ETH_ALEN] __aligned(4); case RTL_GIGA_MAC_VER_35 ... RTL_GIGA_MAC_VER_38: case RTL_GIGA_MAC_VER_40 ... RTL_GIGA_MAC_VER_51: *(u32 *)&mac_addr[0] = rtl_eri_read(tp, 0xe0, ERIAR_EXGMAC); - *(u16 *)&mac_addr[2] = rtl_eri_read(tp, 0xe4, ERIAR_EXGMAC); + *(u16 *)&mac_addr[4] = rtl_eri_read(tp, 0xe4, ERIAR_EXGMAC); - if (is_valid_ether_addr((u8 *)mac_addr)) - rtl_rar_set(tp, (u8 *)mac_addr); + if (is_valid_ether_addr(mac_addr)) + rtl_rar_set(tp, mac_addr); break; default: break; |