* [PATCH] sh_eth: Avoid memcpy() over-reading of ETH_SS_STATS
@ 2021-06-16 19:53 Kees Cook
2021-06-16 20:10 ` patchwork-bot+netdevbpf
2021-06-17 5:50 ` Wolfram Sang
0 siblings, 2 replies; 3+ messages in thread
From: Kees Cook @ 2021-06-16 19:53 UTC (permalink / raw)
To: netdev
Cc: Kees Cook, Sergei Shtylyov, David S. Miller, Jakub Kicinski,
Sergey Shtylyov, Andrew Lunn, Wolfram Sang, Geert Uytterhoeven,
Jesse Brandeburg, Michael Walle, Yang Yingliang, Rikard Falkeborn,
linux-kernel, linux-renesas-soc, 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/renesas/sh_eth.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 177523be4fb6..840478692a37 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -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;
}
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] sh_eth: Avoid memcpy() over-reading of ETH_SS_STATS
2021-06-16 19:53 [PATCH] sh_eth: Avoid memcpy() over-reading of ETH_SS_STATS Kees Cook
@ 2021-06-16 20:10 ` patchwork-bot+netdevbpf
2021-06-17 5:50 ` Wolfram Sang
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-06-16 20:10 UTC (permalink / raw)
To: Kees Cook
Cc: netdev, sergei.shtylyov, davem, kuba, s.shtylyov, andrew,
wsa+renesas, geert+renesas, jesse.brandeburg, michael,
yangyingliang, rikard.falkeborn, linux-kernel, linux-renesas-soc,
linux-hardening
Hello:
This patch was applied to netdev/net.git (refs/heads/master):
On Wed, 16 Jun 2021 12:53:33 -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:
- sh_eth: Avoid memcpy() over-reading of ETH_SS_STATS
https://git.kernel.org/netdev/net/c/224004fbb033
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] 3+ messages in thread* Re: [PATCH] sh_eth: Avoid memcpy() over-reading of ETH_SS_STATS
2021-06-16 19:53 [PATCH] sh_eth: Avoid memcpy() over-reading of ETH_SS_STATS Kees Cook
2021-06-16 20:10 ` patchwork-bot+netdevbpf
@ 2021-06-17 5:50 ` Wolfram Sang
1 sibling, 0 replies; 3+ messages in thread
From: Wolfram Sang @ 2021-06-17 5:50 UTC (permalink / raw)
To: Kees Cook
Cc: netdev, Sergei Shtylyov, David S. Miller, Jakub Kicinski,
Sergey Shtylyov, Andrew Lunn, Geert Uytterhoeven,
Jesse Brandeburg, Michael Walle, Yang Yingliang, Rikard Falkeborn,
linux-kernel, linux-renesas-soc, linux-hardening
[-- Attachment #1: Type: text/plain, Size: 567 bytes --]
On Wed, Jun 16, 2021 at 12:53:33PM -0700, Kees Cook 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.
>
> Signed-off-by: Kees Cook <keescook@chromium.org>
For the record:
Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-06-17 5:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-16 19:53 [PATCH] sh_eth: Avoid memcpy() over-reading of ETH_SS_STATS Kees Cook
2021-06-16 20:10 ` patchwork-bot+netdevbpf
2021-06-17 5:50 ` Wolfram Sang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox