Skip to content

Commit

Permalink
r8169: Avoid memcpy() over-reading of ETH_SS_STATS
Browse files Browse the repository at this point in the history
[ Upstream commit da5ac77 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
Kees Cook authored and Sasha Levin committed Jun 30, 2021
1 parent a457d94 commit da5b3a5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/net/ethernet/realtek/r8169.c
Original file line number Diff line number Diff line change
Expand Up @@ -2314,7 +2314,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;
}
}
Expand Down

0 comments on commit da5b3a5

Please sign in to comment.