]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
net: sparx5: replace deprecated strncpy with ethtool_sprintf
authorJustin Stitt <justinstitt@google.com>
Wed, 11 Oct 2023 21:37:18 +0000 (21:37 +0000)
committerJakub Kicinski <kuba@kernel.org>
Sat, 14 Oct 2023 00:10:32 +0000 (17:10 -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>
Link: https://lore.kernel.org/r/20231011-strncpy-drivers-net-ethernet-microchip-sparx5-sparx5_ethtool-c-v1-1-410953d07f42@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/microchip/sparx5/sparx5_ethtool.c

index 01f3a3a41cdb32ecc9e4c87b150852efec89e02e..37d2584b48a7ca9eeef5e5de6c268541f8b92307 100644 (file)
@@ -1012,8 +1012,7 @@ static void sparx5_get_sset_strings(struct net_device *ndev, u32 sset, u8 *data)
                return;
 
        for (idx = 0; idx < sparx5->num_ethtool_stats; idx++)
-               strncpy(data + idx * ETH_GSTRING_LEN,
-                       sparx5->stats_layout[idx], ETH_GSTRING_LEN);
+               ethtool_sprintf(&data, "%s", sparx5->stats_layout[idx]);
 }
 
 static void sparx5_get_sset_data(struct net_device *ndev,