ethtool: fix drvinfo strings set in drivers

Use strlcpy where possible to ensure the string is \0 terminated.
Use always sizeof(string) instead of 32, ETHTOOL_BUSINFO_LEN
and custom defines.
Use snprintf instead of sprint.
Remove unnecessary inits of ->fw_version
Remove unnecessary inits of drvinfo struct.

Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>

6 files changed, 16 insertions, 15 deletions

diff --git a/drivers/net/usb/asix_common.c b/drivers/net/usb/asix_common.c
index 50d167330d38..19bc23f20526 100644
--- a/drivers/net/usb/asix_common.c
+++ b/drivers/net/usb/asix_common.c
@@ -510,8 +510,8 @@ void asix_get_drvinfo(struct net_device *net, struct ethtool_drvinfo *info)
 {
         /* 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);
+        strlcpy(info->driver, DRIVER_NAME, sizeof(info->driver));
+        strlcpy(info->version, DRIVER_VERSION, sizeof(info->version));
         info->eedump_len = AX_EEPROM_LEN;
 }
 
diff --git a/drivers/net/usb/catc.c b/drivers/net/usb/catc.c
index 18d9579123ea..8d5cac2d8e33 100644
--- a/drivers/net/usb/catc.c
+++ b/drivers/net/usb/catc.c
@@ -685,9 +685,9 @@ static void catc_get_drvinfo(struct net_device *dev,
                              struct ethtool_drvinfo *info)
 {
         struct catc *catc = netdev_priv(dev);
-        strncpy(info->driver, driver_name, ETHTOOL_BUSINFO_LEN);
-        strncpy(info->version, DRIVER_VERSION, ETHTOOL_BUSINFO_LEN);
-        usb_make_path (catc->usbdev, info->bus_info, sizeof info->bus_info);
+        strlcpy(info->driver, driver_name, sizeof(info->driver));
+        strlcpy(info->version, DRIVER_VERSION, sizeof(info->version));
+        usb_make_path(catc->usbdev, info->bus_info, sizeof(info->bus_info));
 }
 
 static int catc_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
index 71b6e92b8e9b..016aa6fe6acb 100644
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c
@@ -65,9 +65,9 @@ cdc_ncm_get_drvinfo(struct net_device *net, struct ethtool_drvinfo *info)
 {
         struct usbnet *dev = netdev_priv(net);
 
-        strncpy(info->driver, dev->driver_name, sizeof(info->driver));
-        strncpy(info->version, DRIVER_VERSION, sizeof(info->version));
-        strncpy(info->fw_version, dev->driver_info->description,
+        strlcpy(info->driver, dev->driver_name, sizeof(info->driver));
+        strlcpy(info->version, DRIVER_VERSION, sizeof(info->version));
+        strlcpy(info->fw_version, dev->driver_info->description,
                 sizeof(info->fw_version));
         usb_make_path(dev->udev, info->bus_info, sizeof(info->bus_info));
 }
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c
index a0b5807b30d4..3c02f950a3d2 100644
--- a/drivers/net/usb/pegasus.c
+++ b/drivers/net/usb/pegasus.c
@@ -1074,8 +1074,9 @@ static void pegasus_get_drvinfo(struct net_device *dev,
                                 struct ethtool_drvinfo *info)
 {
         pegasus_t *pegasus = netdev_priv(dev);
-        strncpy(info->driver, driver_name, sizeof(info->driver) - 1);
-        strncpy(info->version, DRIVER_VERSION, sizeof(info->version) - 1);
+
+        strlcpy(info->driver, driver_name, sizeof(info->driver));
+        strlcpy(info->version, DRIVER_VERSION, sizeof(info->version));
         usb_make_path(pegasus->usb, info->bus_info, sizeof(info->bus_info));
 }
 
diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c
index 5f39a3b225ef..a491d3a95393 100644
--- a/drivers/net/usb/rtl8150.c
+++ b/drivers/net/usb/rtl8150.c
@@ -776,9 +776,9 @@ static void rtl8150_get_drvinfo(struct net_device *netdev, struct ethtool_drvinf
 {
         rtl8150_t *dev = netdev_priv(netdev);
 
-        strncpy(info->driver, driver_name, ETHTOOL_BUSINFO_LEN);
-        strncpy(info->version, DRIVER_VERSION, ETHTOOL_BUSINFO_LEN);
-        usb_make_path(dev->udev, info->bus_info, sizeof info->bus_info);
+        strlcpy(info->driver, driver_name, sizeof(info->driver));
+        strlcpy(info->version, DRIVER_VERSION, sizeof(info->version));
+        usb_make_path(dev->udev, info->bus_info, sizeof(info->bus_info));
 }
 
 static int rtl8150_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
index 18dd4257ab17..453aa6c1277c 100644
--- a/drivers/net/usb/sierra_net.c
+++ b/drivers/net/usb/sierra_net.c
@@ -598,8 +598,8 @@ static void sierra_net_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);
+        strlcpy(info->driver, driver_name, sizeof(info->driver));
+        strlcpy(info->version, DRIVER_VERSION, sizeof(info->version));
 }
 
 static u32 sierra_net_get_link(struct net_device *net)