sweep the floors and convert some .get_drvinfo routines to strlcpy

Per the mention made by Ben Hutchings that strlcpy is now the preferred
string copy routine for a .get_drvinfo routine, do a bit of floor
sweeping and convert some of the as-yet unconverted ethernet drivers to
it.

Signed-off-by: Rick Jones <rick.jones2@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 8 insertions, 5 deletions

diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
index 8aa1c6e8667b..cc228cf3d84b 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
@@ -140,11 +140,14 @@ qlcnic_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo)
         fw_major = QLCRD32(adapter, QLCNIC_FW_VERSION_MAJOR);
         fw_minor = QLCRD32(adapter, QLCNIC_FW_VERSION_MINOR);
         fw_build = QLCRD32(adapter, QLCNIC_FW_VERSION_SUB);
-        sprintf(drvinfo->fw_version, "%d.%d.%d", fw_major, fw_minor, fw_build);
-
-        strlcpy(drvinfo->bus_info, pci_name(adapter->pdev), 32);
-        strlcpy(drvinfo->driver, qlcnic_driver_name, 32);
-        strlcpy(drvinfo->version, QLCNIC_LINUX_VERSIONID, 32);
+        snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version),
+                "%d.%d.%d", fw_major, fw_minor, fw_build);
+
+        strlcpy(drvinfo->bus_info, pci_name(adapter->pdev),
+                sizeof(drvinfo->bus_info));
+        strlcpy(drvinfo->driver, qlcnic_driver_name, sizeof(drvinfo->driver));
+        strlcpy(drvinfo->version, QLCNIC_LINUX_VERSIONID,
+                sizeof(drvinfo->version));
 }
 
 static int