Commit c9183f45 authored by Kees Cook's avatar Kees Cook Committed by Tony Nguyen
Browse files

igb: 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: default avatarKees Cook <keescook@chromium.org>
Tested-by: default avatarTony Brelinski <tonyx.brelinski@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 07be39e3

drivers/net/ethernet/intel/igb/igb_ethtool.c

+1 −2
Original line number Diff line number Diff line
@@ -2343,8 +2343,7 @@ static void igb_get_strings(struct net_device *netdev, u32 stringset, u8 *data) 


	switch (stringset) {

	case ETH_SS_TEST:

		memcpy(data, *igb_gstrings_test,

			IGB_TEST_LEN*ETH_GSTRING_LEN);

		memcpy(data, igb_gstrings_test, sizeof(igb_gstrings_test));

		break;

	case ETH_SS_STATS:

		for (i = 0; i < IGB_GLOBAL_STATS_LEN; i++)