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, 6 insertions, 6 deletions

diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c
index 00454a10f88d..76b302f30c87 100644
--- a/drivers/net/ethernet/emulex/benet/be_ethtool.c
+++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c
@@ -183,12 +183,12 @@ static void be_get_drvinfo(struct net_device *netdev,
 
         strlcpy(drvinfo->driver, DRV_NAME, sizeof(drvinfo->driver));
         strlcpy(drvinfo->version, DRV_VER, sizeof(drvinfo->version));
-        strncpy(drvinfo->fw_version, adapter->fw_ver, FW_VER_LEN);
-        if (memcmp(adapter->fw_ver, fw_on_flash, FW_VER_LEN) != 0) {
-                strcat(drvinfo->fw_version, " [");
-                strcat(drvinfo->fw_version, fw_on_flash);
-                strcat(drvinfo->fw_version, "]");
-        }
+        if (!memcmp(adapter->fw_ver, fw_on_flash, FW_VER_LEN))
+                strlcpy(drvinfo->fw_version, adapter->fw_ver,
+                        sizeof(drvinfo->fw_version));
+        else
+                snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version),
+                         "%s [%s]", adapter->fw_ver, fw_on_flash);
 
         strlcpy(drvinfo->bus_info, pci_name(adapter->pdev),
                 sizeof(drvinfo->bus_info));