-----Original Message----- From: Kees Cook keescook@chromium.org Sent: Wednesday, August 18, 2021 11:35 AM To: linux-kernel@vger.kernel.org Cc: Kees Cook keescook@chromium.org; Ariel Elior aelior@marvell.com; Sudarsana Reddy Kalluru skalluru@marvell.com; GR-everest-linux-l2 <GR- everest-linux-l2@marvell.com>; David S. Miller davem@davemloft.net; Jakub Kicinski kuba@kernel.org; netdev@vger.kernel.org; Gustavo A. R. Silva gustavoars@kernel.org; Greg Kroah-Hartman gregkh@linuxfoundation.org; Andrew Morton akpm@linux-foundation.org; linux-wireless@vger.kernel.org; dri-devel@lists.freedesktop.org; linux-staging@lists.linux.dev; linux- block@vger.kernel.org; linux-kbuild@vger.kernel.org; clang-built- linux@googlegroups.com; Rasmus Villemoes linux@rasmusvillemoes.dk; linux-hardening@vger.kernel.org Subject: [PATCH v2 17/63] bnx2x: Use struct_group() for memcpy() region

In preparation for FORTIFY_SOURCE performing compile-time and run-time field bounds checking for memcpy(), memmove(), and memset(), avoid intentionally writing across neighboring fields.

Use struct_group() in struct nig_stats around members egress_mac_pkt0_lo, egress_mac_pkt0_hi, egress_mac_pkt1_lo, and egress_mac_pkt1_hi (and the respective members in struct bnx2x_eth_stats), so they can be referenced together. This will allow memcpy() and sizeof() to more easily reason about sizes, improve readability, and avoid future warnings about writing beyond the end of struct bnx2x_eth_stats's rx_stat_ifhcinbadoctets_hi.

"pahole" shows no size nor member offset changes to either struct. "objdump -d" shows no meaningful object code changes (i.e. only source line number induced differences and optimizations).

Additionally adds BUILD_BUG_ON() to compare the separate struct group sizes.

Cc: Ariel Elior aelior@marvell.com Cc: Sudarsana Kalluru skalluru@marvell.com Cc: GR-everest-linux-l2@marvell.com Cc: "David S. Miller" davem@davemloft.net Cc: Jakub Kicinski kuba@kernel.org Cc: netdev@vger.kernel.org Signed-off-by: Kees Cook keescook@chromium.org

---

Reviewed-by: Prabhakar Kushwaha pkushwaha@marvell.com