Skip to content

Commit 06726e8

Browse files
author
Herton R. Krzesinski
committed
Merge: etherdevice: Adjust ether_addr* prototypes to silence -Wstringop-overead
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/1626 Bugzilla: https://bugzilla.redhat.com/2142659 commit 2618a0d Author: Kees Cook <keescook@chromium.org> Date: Sat Feb 12 09:14:49 2022 -0800 etherdevice: Adjust ether_addr* prototypes to silence -Wstringop-overead With GCC 12, -Wstringop-overread was warning about an implicit cast from char[6] to char[8]. However, the extra 2 bytes are always thrown away, alignment doesn't matter, and the risk of hitting the edge of unallocated memory has been accepted, so this prototype can just be converted to a regular char *. Silences: net/core/dev.c: In function ‘bpf_prog_run_generic_xdp’: net/core/dev.c:4618:21: warning: ‘ether_addr_equal_64bits’ reading 8 bytes from a region of size 6 [-Wstringop-overread] 4618 | orig_host = ether_addr_equal_64bits(eth->h_dest, > skb->dev->dev_addr); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ net/core/dev.c:4618:21: note: referencing argument 1 of type ‘const u8[8]’ {aka ‘const unsigned char[8]’} net/core/dev.c:4618:21: note: referencing argument 2 of type ‘const u8[8]’ {aka ‘const unsigned char[8]’} In file included from net/core/dev.c:91: include/linux/etherdevice.h:375:20: note: in a call to function ‘ether_addr_equal_64bits’ 375 | static inline bool ether_addr_equal_64bits(const u8 addr1[6+2], | ^~~~~~~~~~~~~~~~~~~~~~~ Reported-by: Marc Kleine-Budde <mkl@pengutronix.de> Tested-by: Marc Kleine-Budde <mkl@pengutronix.de> Link: https://lore.kernel.org/netdev/20220212090811.uuzk6d76agw2vv73@pengutronix.de Cc: Jakub Kicinski <kuba@kernel.org> Cc: "David S. Miller" <davem@davemloft.net> Cc: netdev@vger.kernel.org Signed-off-by: Kees Cook <keescook@chromium.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Eric Chanudet <echanude@redhat.com> Approved-by: Jiri Benc <jbenc@redhat.com> Approved-by: Antoine Tenart <atenart@redhat.com> Approved-by: Ivan Vecera <ivecera@redhat.com> Approved-by: Andrea Claudi <aclaudi@redhat.com> Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
2 parents e7a2a9b + 85103f4 commit 06726e8

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

include/linux/etherdevice.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ static inline bool is_multicast_ether_addr(const u8 *addr)
132132
#endif
133133
}
134134

135-
static inline bool is_multicast_ether_addr_64bits(const u8 addr[6+2])
135+
static inline bool is_multicast_ether_addr_64bits(const u8 *addr)
136136
{
137137
#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64
138138
#ifdef __BIG_ENDIAN
@@ -369,8 +369,7 @@ static inline bool ether_addr_equal(const u8 *addr1, const u8 *addr2)
369369
* Please note that alignment of addr1 & addr2 are only guaranteed to be 16 bits.
370370
*/
371371

372-
static inline bool ether_addr_equal_64bits(const u8 addr1[6+2],
373-
const u8 addr2[6+2])
372+
static inline bool ether_addr_equal_64bits(const u8 *addr1, const u8 *addr2)
374373
{
375374
#if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64
376375
u64 fold = (*(const u64 *)addr1) ^ (*(const u64 *)addr2);

0 commit comments

Comments
 (0)