net: dsa: lantiq_gswip: replace deprecated strncpy with ethtool_sprintf
authorJustin Stitt <justinstitt@google.com>
Mon, 9 Oct 2023 18:24:20 +0000 (18:24 +0000)
committerJakub Kicinski <kuba@kernel.org>
Thu, 12 Oct 2023 00:26:04 +0000 (17:26 -0700)
`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
Link: https://manpages.debian.org/testing/linux-manual-4.8/strscpy.9.en.html
Link: https://github.com/KSPP/linux/issues/90
Signed-off-by: Justin Stitt <justinstitt@google.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Link: https://lore.kernel.org/r/20231009-strncpy-drivers-net-dsa-lantiq_gswip-c-v1-1-d55a986a14cc@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/dsa/lantiq_gswip.c

index 25abf2caf5fb5080661992b3499febaa1a5124df..1a2d5797bf98c6e6e21291e9520e40fc68f01877 100644 (file)
@@ -1759,8 +1759,7 @@ static void gswip_get_strings(struct dsa_switch *ds, int port, u32 stringset,
                return;
 
        for (i = 0; i < ARRAY_SIZE(gswip_rmon_cnt); i++)
-               strncpy(data + i * ETH_GSTRING_LEN, gswip_rmon_cnt[i].name,
-                       ETH_GSTRING_LEN);
+               ethtool_sprintf(&data, "%s", gswip_rmon_cnt[i].name);
 }
 
 static u32 gswip_bcm_ram_entry_read(struct gswip_priv *priv, u32 table,