Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: asix: fix fortify warning

When compiling with gcc version 14.0.0 20231129 (experimental) and
CONFIG_FORTIFY_SOURCE=y, I've noticed the following warning:

...
In function 'fortify_memcpy_chk',
inlined from 'ax88796c_tx_fixup' at drivers/net/ethernet/asix/ax88796c_main.c:287:2:
./include/linux/fortify-string.h:588:25: warning: call to '__read_overflow2_field'
declared with attribute warning: detected read beyond size of field (2nd parameter);
maybe use struct_group()? [-Wattribute-warning]
588 | __read_overflow2_field(q_size_field, size);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
...

This call to 'memcpy()' is interpreted as an attempt to copy TX_OVERHEAD
(which is 8) bytes from 4-byte 'sop' field of 'struct tx_pkt_info' and
thus overread warning is issued. Since we actually want to copy both
'sop' and 'seg' fields at once, use the convenient 'struct_group()' here.

Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>
Acked-by: Łukasz Stelmach <l.stelmach@samsung.com>
Link: https://lore.kernel.org/r/20231211090535.9730-1-dmantipov@yandex.ru
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Dmitry Antipov and committed by
Jakub Kicinski
2a626448 609c767f

+6 -4
+1 -1
drivers/net/ethernet/asix/ax88796c_main.c
··· 284 284 ax88796c_proc_tx_hdr(&info, skb->ip_summed); 285 285 286 286 /* SOP and SEG header */ 287 - memcpy(skb_push(skb, TX_OVERHEAD), &info.sop, TX_OVERHEAD); 287 + memcpy(skb_push(skb, TX_OVERHEAD), &info.tx_overhead, TX_OVERHEAD); 288 288 289 289 /* Write SPI TXQ header */ 290 290 memcpy(skb_push(skb, spi_len), ax88796c_tx_cmd_buf, spi_len);
+5 -3
drivers/net/ethernet/asix/ax88796c_main.h
··· 25 25 #define AX88796C_PHY_REGDUMP_LEN 14 26 26 #define AX88796C_PHY_ID 0x10 27 27 28 - #define TX_OVERHEAD 8 28 + #define TX_OVERHEAD sizeof_field(struct tx_pkt_info, tx_overhead) 29 29 #define TX_EOP_SIZE 4 30 30 31 31 #define AX_MCAST_FILTER_SIZE 8 ··· 549 549 }; 550 550 551 551 struct tx_pkt_info { 552 - struct tx_sop_header sop; 553 - struct tx_segment_header seg; 552 + struct_group(tx_overhead, 553 + struct tx_sop_header sop; 554 + struct tx_segment_header seg; 555 + ); 554 556 struct tx_eop_header eop; 555 557 u16 pkt_len; 556 558 u16 seq_num;