Skip to content

Commit 40507e7

Browse files
arndbkuba-moo
authored andcommitted
ethernet: s2io: fix setting mac address during resume
After recent cleanups, gcc started warning about a suspicious memcpy() call during the s2io_io_resume() function: In function '__dev_addr_set', inlined from 'eth_hw_addr_set' at include/linux/etherdevice.h:318:2, inlined from 's2io_set_mac_addr' at drivers/net/ethernet/neterion/s2io.c:5205:2, inlined from 's2io_io_resume' at drivers/net/ethernet/neterion/s2io.c:8569:7: arch/x86/include/asm/string_32.h:182:25: error: '__builtin_memcpy' accessing 6 bytes at offsets 0 and 2 overlaps 4 bytes at offset 2 [-Werror=restrict] 182 | #define memcpy(t, f, n) __builtin_memcpy(t, f, n) | ^~~~~~~~~~~~~~~~~~~~~~~~~ include/linux/netdevice.h:4648:9: note: in expansion of macro 'memcpy' 4648 | memcpy(dev->dev_addr, addr, len); | ^~~~~~ What apparently happened is that an old cleanup changed the calling conventions for s2io_set_mac_addr() from taking an ethernet address as a character array to taking a struct sockaddr, but one of the callers was not changed at the same time. Change it to instead call the low-level do_s2io_prog_unicast() function that still takes the old argument type. Fixes: 2fd3768 ("S2io: Added support set_mac_address driver entry point") Signed-off-by: Arnd Bergmann <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent cbcc507 commit 40507e7

File tree

1 file changed

+1
-1
lines changed
  • drivers/net/ethernet/neterion

1 file changed

+1
-1
lines changed

drivers/net/ethernet/neterion/s2io.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8566,7 +8566,7 @@ static void s2io_io_resume(struct pci_dev *pdev)
85668566
return;
85678567
}
85688568

8569-
if (s2io_set_mac_addr(netdev, netdev->dev_addr) == FAILURE) {
8569+
if (do_s2io_prog_unicast(netdev, netdev->dev_addr) == FAILURE) {
85708570
s2io_card_down(sp);
85718571
pr_err("Can't restore mac addr after reset.\n");
85728572
return;

0 commit comments

Comments
 (0)