* [PATCH] r8169: Avoid memcpy() over-reading of ETH_SS_STATS
@ 2021-06-16 19:53 Kees Cook
2021-06-16 20:10 ` patchwork-bot+netdevbpf
0 siblings, 1 reply; 2+ messages in thread
From: Kees Cook @ 2021-06-16 19:53 UTC (permalink / raw)
To: netdev
Cc: Kees Cook, Heiner Kallweit, David S. Miller, Jakub Kicinski,
linux-kernel, nic_swsd, linux-hardening
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>
---
drivers/net/ethernet/realtek/r8169_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index 6a9fe9f7e0be..f744557c33a3 100644
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -1669,7 +1669,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;
}
}
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] r8169: Avoid memcpy() over-reading of ETH_SS_STATS
2021-06-16 19:53 [PATCH] r8169: Avoid memcpy() over-reading of ETH_SS_STATS Kees Cook
@ 2021-06-16 20:10 ` patchwork-bot+netdevbpf
0 siblings, 0 replies; 2+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-06-16 20:10 UTC (permalink / raw)
To: Kees Cook
Cc: netdev, hkallweit1, davem, kuba, linux-kernel, nic_swsd,
linux-hardening
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
On Wed, 16 Jun 2021 12:53:59 -0700 you wrote:
> 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.
>
> [...]
Here is the summary with links:
- r8169: Avoid memcpy() over-reading of ETH_SS_STATS
https://git.kernel.org/netdev/net/c/da5ac772cfe2
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-06-16 20:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-16 19:53 [PATCH] r8169: Avoid memcpy() over-reading of ETH_SS_STATS Kees Cook
2021-06-16 20:10 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox