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/usb/gadget/u_ether.c b/drivers/usb/gadget/u_ether.c
index 4ec3c0d7a18b..a0aa721d8b21 100644
--- a/drivers/usb/gadget/u_ether.c
+++ b/drivers/usb/gadget/u_ether.c
@@ -159,12 +159,12 @@ static int ueth_change_mtu(struct net_device *net, int new_mtu)
 
 static void eth_get_drvinfo(struct net_device *net, struct ethtool_drvinfo *p)
 {
-        struct eth_dev  *dev = netdev_priv(net);
+        struct eth_dev *dev = netdev_priv(net);
 
-        strlcpy(p->driver, "g_ether", sizeof p->driver);
-        strlcpy(p->version, UETH__VERSION, sizeof p->version);
-        strlcpy(p->fw_version, dev->gadget->name, sizeof p->fw_version);
-        strlcpy(p->bus_info, dev_name(&dev->gadget->dev), sizeof p->bus_info);
+        strlcpy(p->driver, "g_ether", sizeof(p->driver));
+        strlcpy(p->version, UETH__VERSION, sizeof(p->version));
+        strlcpy(p->fw_version, dev->gadget->name, sizeof(p->fw_version));
+        strlcpy(p->bus_info, dev_name(&dev->gadget->dev), sizeof(p->bus_info));
 }
 
 /* REVISIT can also support: