r8169: Avoid memcpy() over-reading of ETH_SS_STATS
authorKees Cook <keescook@chromium.org>
Wed, 16 Jun 2021 19:53:59 +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/realtek/r8169_main.c

index 2c89cde7da1e6e8aef9a4d07fca180a2dc1afc51..2ee72dc431cd55f380131257b37d5e515e93ccd7 100644 (file)
@@ -1671,7 +1671,7 @@ static void rtl8169_get_strings(struct net_device *dev, u32 stringset, u8 *data)
 {
        switch(stringset) {
        case ETH_SS_STATS:
-               memcpy(data, *rtl8169_gstrings, sizeof(rtl8169_gstrings));
+               memcpy(data, rtl8169_gstrings, sizeof(rtl8169_gstrings));
                break;
        }
 }