Commit 99718abd authored Jun 16, 2021 by Kees Cook Committed by David S. Miller Jun 16, 2021

r8152: Avoid memcpy() over-reading of ETH_SS_STATS



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>

parent 1b29df0e

drivers/net/usb/r8152.c

+1 −1

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