net: usb: replace deprecated strncpy with strscpy
authorJustin Stitt <justinstitt@google.com>
Thu, 12 Oct 2023 22:33:34 +0000 (22:33 +0000)
committerJakub Kicinski <kuba@kernel.org>
Mon, 16 Oct 2023 23:16:30 +0000 (16:16 -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.

Other implementations of .*get_drvinfo use strscpy so this patch brings
sr_get_drvinfo() in line as well:

igb/igb_ethtool.c +851
static void igb_get_drvinfo(struct net_device *netdev,

igbvf/ethtool.c
167:static void igbvf_get_drvinfo(struct net_device *netdev,

i40e/i40e_ethtool.c
1999:static void i40e_get_drvinfo(struct net_device *netdev,

e1000/e1000_ethtool.c
529:static void e1000_get_drvinfo(struct net_device *netdev,

ixgbevf/ethtool.c
211:static void ixgbevf_get_drvinfo(struct net_device *netdev,

...

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: Andrew Lunn <andrew@lunn.ch>
Link: https://lore.kernel.org/r/20231012-strncpy-drivers-net-usb-sr9800-c-v1-1-5540832c8ec2@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/usb/sr9800.c

index f5e19f3ef6cdd250726730f5ec90f6ed706b1903..143bd4ab160df4631957724cc47ae04556a27ad9 100644 (file)
@@ -474,8 +474,8 @@ static void sr_get_drvinfo(struct net_device *net,
 {
        /* Inherit standard device info */
        usbnet_get_drvinfo(net, info);
-       strncpy(info->driver, DRIVER_NAME, sizeof(info->driver));
-       strncpy(info->version, DRIVER_VERSION, sizeof(info->version));
+       strscpy(info->driver, DRIVER_NAME, sizeof(info->driver));
+       strscpy(info->version, DRIVER_VERSION, sizeof(info->version));
 }
 
 static u32 sr_get_link(struct net_device *net)