Skip to contentSkip to conversation

net: 8139too: use unaligned helpers when setting MAC address

PATCH In review Lucas Poupeau 2 participants 3 messages Aug 24

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: 8139too: use unaligned helpers when setting MAC address

From: Lucas <[email protected]>

rtl8139_set_mac_address() accesses dev->dev_addr by casting it to u32 pointers. Besides potentially performing unaligned accesses, the second read starts at offset 4 and reads 32 bits even though only two bytes remain in the Ethernet address.

Use get_unaligned_le32() and get_unaligned_le16() to read the address with the appropriate width and endianness. This also fixes the Sparse type warnings caused by passing __le32 values to iowrite32().

---
 drivers/net/ethernet/realtek/8139too.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/ethernet/realtek/8139too.c +3 -2
index 8241bcf76664..1736599d7244 100644
@@ -112,6 +112,7 @@
 #include <linux/gfp.h>
 #include <linux/if_vlan.h>
 #include <asm/irq.h>
+#include <linux/unaligned.h>
 
 /* Default Message level */
 #define RTL8139_DEF_MSG_ENABLE   (NETIF_MSG_DRV   | \
@@ -2230,8 +2231,8 @@ static int rtl8139_set_mac_address(struct net_device *dev, void *p)
 	spin_lock_irq(&tp->lock);
 
 	RTL_W8_F(Cfg9346, Cfg9346_Unlock);
-	RTL_W32_F(MAC0 + 0, cpu_to_le32 (*(u32 *) (dev->dev_addr + 0)));
-	RTL_W32_F(MAC0 + 4, cpu_to_le32 (*(u32 *) (dev->dev_addr + 4)));
+	RTL_W32_F(MAC0 + 0, get_unaligned_le32(dev->dev_addr));
+	RTL_W32_F(MAC0 + 4, get_unaligned_le16(dev->dev_addr + 4));
 	RTL_W8_F(Cfg9346, Cfg9346_Lock);
 
 	spin_unlock_irq(&tp->lock);
Signature · 1 line
2.55.0
#1 lore raw
Quoted 7 lines · Lucas Poupeau

From: Lucas <[email protected]>

rtl8139_set_mac_address() accesses dev->dev_addr by casting it to u32 pointers. Besides potentially performing unaligned accesses, the second read starts at offset 4 and reads 32 bits even though only two bytes remain in the Ethernet address.

Quoted 5 lines

Use get_unaligned_le32() and get_unaligned_le16() to read the address with the appropriate width and endianness. This also fixes the Sparse type warnings caused by passing __le32 values to iowrite32().

If you are targeting the net tree, you need a Fixes: tag.

https://www.kernel.org/doc/html/latest/process/maintainer-netdev.html

Does this bother people?

https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html

Andrew

---
pw-bot: cr

author
#2 lore raw

Hi Andrew,

After looking into this further, I don't think this warrants a fix for the net tree. dev->dev_addr is backed by a MAX_ADDR_LEN buffer, so the second 32-bit read does not actually go out of bounds, and I don't have a concrete case where the alignment causes a problem.

I'll drop the patch.
Thanks for the review.

Regards,
Lucas

Quoted 27 lines · Andrew Lunn
Quoted 7 lines · Lucas Poupeau

From: Lucas <[email protected]>

rtl8139_set_mac_address() accesses dev->dev_addr by casting it to u32 pointers. Besides potentially performing unaligned accesses, the second read starts at offset 4 and reads 32 bits even though only two bytes remain in the Ethernet address.

Quoted 5 lines

Use get_unaligned_le32() and get_unaligned_le16() to read the address with the appropriate width and endianness. This also fixes the Sparse type warnings caused by passing __le32 values to iowrite32().

If you are targeting the net tree, you need a Fixes: tag.

https://www.kernel.org/doc/html/latest/process/maintainer-netdev.html

Does this bother people?

https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html

Andrew

---
pw-bot: cr