mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-11-28 07:44:32 +00:00
4354b34f6f
Backport lots upstream changes, many of them fixes, for the mt7530 DSA driver, similar to how it was done for Linux 6.1 in the previous commit. The remaining differences compared to the upstream driver are only the 'slave' -> 'user', 'master' -> 'conduit' language change in DSA and the rename of 'struct ethtool_eee' to 'struct ethtool_keee' as well as tree-wide replacement of ethtool_sprintf with ethtool_puts, all of them do not have any functional impact. Apart from some minor bug fixes and style improvements the switch should now behave more conformant when it comes to link-local frames, and we will again be able to cleanly pick patches from upstream. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
41 lines
1.6 KiB
Diff
41 lines
1.6 KiB
Diff
From 9b4f1f5a0801652056670a38503b4049eb413caf Mon Sep 17 00:00:00 2001
|
|
From: Justin Stitt <justinstitt@google.com>
|
|
Date: Mon, 9 Oct 2023 18:29:19 +0000
|
|
Subject: [PATCH 03/30] net: dsa: mt7530: replace deprecated strncpy with
|
|
ethtool_sprintf
|
|
|
|
`strncpy` is deprecated for use on NUL-terminated destination strings
|
|
[1] and as such we should prefer more robust and less ambiguous string
|
|
interfaces.
|
|
|
|
ethtool_sprintf() is designed specifically for get_strings() usage.
|
|
Let's replace strncpy in favor of this more robust and easier to
|
|
understand interface.
|
|
|
|
Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#strncpy-on-nul-terminated-strings [1]
|
|
Link: https://manpages.debian.org/testing/linux-manual-4.8/strscpy.9.en.html [2]
|
|
Link: https://github.com/KSPP/linux/issues/90
|
|
Signed-off-by: Justin Stitt <justinstitt@google.com>
|
|
Reviewed-by: Kees Cook <keescook@chromium.org>
|
|
Acked-by: Daniel Golle <daniel@makrotopia.org>
|
|
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
|
|
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
|
|
Link: https://lore.kernel.org/r/20231009-strncpy-drivers-net-dsa-mt7530-c-v1-1-ec6677a6436a@google.com
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/dsa/mt7530.c | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
--- a/drivers/net/dsa/mt7530.c
|
|
+++ b/drivers/net/dsa/mt7530.c
|
|
@@ -836,8 +836,7 @@ mt7530_get_strings(struct dsa_switch *ds
|
|
return;
|
|
|
|
for (i = 0; i < ARRAY_SIZE(mt7530_mib); i++)
|
|
- strncpy(data + i * ETH_GSTRING_LEN, mt7530_mib[i].name,
|
|
- ETH_GSTRING_LEN);
|
|
+ ethtool_sprintf(&data, "%s", mt7530_mib[i].name);
|
|
}
|
|
|
|
static void
|