e100: Avoid memcpy() over-reading of ETH_SS_STATS
authorKees Cook <keescook@chromium.org>
Wed, 16 Jun 2021 19:53:44 +0000 (12:53 -0700)
committerTony Nguyen <anthony.l.nguyen@intel.com>
Fri, 23 Jul 2021 16:08:11 +0000 (09:08 -0700)
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>
drivers/net/ethernet/intel/e100.c

index 1b0958bd24f6ce1a6424fca7fe824a59d00b3677..1ec924c556c55ab0a3479b15f53415c30c9d4ba8 100644 (file)
@@ -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;
        }
 }