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

r8169: Avoid memcpy() over-reading of ETH_SS_STATS



[ Upstream commit da5ac772cfe2a03058b0accfac03fad60c46c24d ]

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 402197b8

drivers/net/ethernet/realtek/r8169.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2338,7 +2338,7 @@ static void rtl8169_get_strings(struct net_device dev, u32 stringset, u8 data)
		{
		switch(stringset) {
		case ETH_SS_STATS:
		memcpy(data, *rtl8169_gstrings, sizeof(rtl8169_gstrings));
		memcpy(data, rtl8169_gstrings, sizeof(rtl8169_gstrings));
		break;
		}
		}