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>

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/net/wimax/i2400m/netdev.c b/drivers/net/wimax/i2400m/netdev.c
index 1d76ae855f07..cedd4d30d996 100644
--- a/drivers/net/wimax/i2400m/netdev.c
+++ b/drivers/net/wimax/i2400m/netdev.c
@@ -596,12 +596,12 @@ static void i2400m_get_drvinfo(struct net_device *net_dev,
 {
         struct i2400m *i2400m = net_dev_to_i2400m(net_dev);
 
-        strncpy(info->driver, KBUILD_MODNAME, sizeof(info->driver) - 1);
-        strncpy(info->fw_version,
-                i2400m->fw_name ? : "", sizeof(info->fw_version) - 1);
+        strlcpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
+        strlcpy(info->fw_version, i2400m->fw_name ? : "",
+                sizeof(info->fw_version));
         if (net_dev->dev.parent)
-                strncpy(info->bus_info, dev_name(net_dev->dev.parent),
-                        sizeof(info->bus_info) - 1);
+                strlcpy(info->bus_info, dev_name(net_dev->dev.parent),
+                        sizeof(info->bus_info));
 }
 
 static const struct ethtool_ops i2400m_ethtool_ops = {