]> git.baikalelectronics.ru Git - kernel.git/commitdiff
sh_eth: Avoid memcpy() over-reading of ETH_SS_STATS
authorKees Cook <keescook@chromium.org>
Wed, 16 Jun 2021 19:53:33 +0000 (12:53 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 16 Jun 2021 20:02:07 +0000 (13:02 -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: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/renesas/sh_eth.c

index c5b154868c1fc9a595b881d0c9ce3d739d510816..713d3629b4c1caae27173bcd26a62163ac9932b1 100644 (file)
@@ -2287,7 +2287,7 @@ static void sh_eth_get_strings(struct net_device *ndev, u32 stringset, u8 *data)
 {
        switch (stringset) {
        case ETH_SS_STATS:
-               memcpy(data, *sh_eth_gstrings_stats,
+               memcpy(data, sh_eth_gstrings_stats,
                       sizeof(sh_eth_gstrings_stats));
                break;
        }