* [resend, PATCH net-next v1 1/1] mac_pton: Don't access memory over expected length
@ 2022-11-08 14:11 Andy Shevchenko
2022-11-10 4:00 ` patchwork-bot+netdevbpf
0 siblings, 1 reply; 2+ messages in thread
From: Andy Shevchenko @ 2022-11-08 14:11 UTC (permalink / raw)
To: Andy Shevchenko, netdev, linux-kernel
Cc: David S. Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni
The strlen() may go too far when estimating the length of
the given string. In some cases it may go over the boundary
and crash the system which is the case according to the commit
13a55372b64e ("ARM: orion5x: Revert commit 4904dbda41c8.").
Rectify this by switching to strnlen() for the expected
maximum length of the string.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
v1[resend]: used net-next (Jakub)
lib/net_utils.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/net_utils.c b/lib/net_utils.c
index af525353395d..c17201df3d08 100644
--- a/lib/net_utils.c
+++ b/lib/net_utils.c
@@ -6,10 +6,11 @@
bool mac_pton(const char *s, u8 *mac)
{
+ size_t maxlen = 3 * ETH_ALEN - 1;
int i;
/* XX:XX:XX:XX:XX:XX */
- if (strlen(s) < 3 * ETH_ALEN - 1)
+ if (strnlen(s, maxlen) < maxlen)
return false;
/* Don't dirty result unless string is valid MAC. */
--
2.35.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [resend, PATCH net-next v1 1/1] mac_pton: Don't access memory over expected length
2022-11-08 14:11 [resend, PATCH net-next v1 1/1] mac_pton: Don't access memory over expected length Andy Shevchenko
@ 2022-11-10 4:00 ` patchwork-bot+netdevbpf
0 siblings, 0 replies; 2+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-11-10 4:00 UTC (permalink / raw)
To: Andy Shevchenko; +Cc: netdev, linux-kernel, davem, edumazet, kuba, pabeni
Hello:
This patch was applied to netdev/net-next.git (master)
by Jakub Kicinski <kuba@kernel.org>:
On Tue, 8 Nov 2022 16:11:08 +0200 you wrote:
> The strlen() may go too far when estimating the length of
> the given string. In some cases it may go over the boundary
> and crash the system which is the case according to the commit
> 13a55372b64e ("ARM: orion5x: Revert commit 4904dbda41c8.").
>
> Rectify this by switching to strnlen() for the expected
> maximum length of the string.
>
> [...]
Here is the summary with links:
- [resend,net-next,v1,1/1] mac_pton: Don't access memory over expected length
https://git.kernel.org/netdev/net-next/c/21780f89d658
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:[~2022-11-10 4:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-08 14:11 [resend, PATCH net-next v1 1/1] mac_pton: Don't access memory over expected length Andy Shevchenko
2022-11-10 4:00 ` 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