Commit cd74f25b authored Jun 16, 2021 by Kees Cook Committed by Tony Nguyen Jul 23, 2021

e100: 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: Tony Nguyen <anthony.l.nguyen@intel.com>

parent c9183f45

drivers/net/ethernet/intel/e100.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2715,10 +2715,10 @@ static void e100_get_strings(struct net_device netdev, u32 stringset, u8 data)
		{
		switch (stringset) {
		case ETH_SS_TEST:
		memcpy(data, *e100_gstrings_test, sizeof(e100_gstrings_test));
		memcpy(data, e100_gstrings_test, sizeof(e100_gstrings_test));
		break;
		case ETH_SS_STATS:
		memcpy(data, *e100_gstrings_stats, sizeof(e100_gstrings_stats));
		memcpy(data, e100_gstrings_stats, sizeof(e100_gstrings_stats));
		break;
		}
		}