Commit cb4a2e4e authored Jun 16, 2021 by Kees Cook Committed by Sasha Levin Jun 30, 2021

sh_eth: Avoid memcpy() over-reading of ETH_SS_STATS



[ Upstream commit 224004fbb033600715dbd626bceec10bfd9c58bc ]

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

The memcpy() is copying the entire structure, not just the first array.
Adjust the source argument so the compiler can do appropriate bounds
checking.

Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 97e0102e

drivers/net/ethernet/renesas/sh_eth.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2322,7 +2322,7 @@ static void sh_eth_get_strings(struct net_device ndev, u32 stringset, u8 data)
		{
		switch (stringset) {
		case ETH_SS_STATS:
		memcpy(data, *sh_eth_gstrings_stats,
		memcpy(data, sh_eth_gstrings_stats,
		sizeof(sh_eth_gstrings_stats));
		break;
		}