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>

4 files changed, 29 insertions, 17 deletions

diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c
index e09ea83b8c4..8a371985319 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c
@@ -83,14 +83,18 @@ netxen_nic_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo)
         u32 fw_minor = 0;
         u32 fw_build = 0;
 
-        strncpy(drvinfo->driver, netxen_nic_driver_name, 32);
-        strncpy(drvinfo->version, NETXEN_NIC_LINUX_VERSIONID, 32);
+        strlcpy(drvinfo->driver, netxen_nic_driver_name,
+                sizeof(drvinfo->driver));
+        strlcpy(drvinfo->version, NETXEN_NIC_LINUX_VERSIONID,
+                sizeof(drvinfo->version));
         fw_major = NXRD32(adapter, NETXEN_FW_VERSION_MAJOR);
         fw_minor = NXRD32(adapter, NETXEN_FW_VERSION_MINOR);
         fw_build = NXRD32(adapter, NETXEN_FW_VERSION_SUB);
-        sprintf(drvinfo->fw_version, "%d.%d.%d", fw_major, fw_minor, fw_build);
+        snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version),
+                "%d.%d.%d", fw_major, fw_minor, fw_build);
 
-        strncpy(drvinfo->bus_info, pci_name(adapter->pdev), 32);
+        strlcpy(drvinfo->bus_info, pci_name(adapter->pdev),
+                sizeof(drvinfo->bus_info));
         drvinfo->regdump_len = NETXEN_NIC_REGS_LEN;
         drvinfo->eedump_len = netxen_nic_get_eeprom_len(dev);
 }
diff --git a/drivers/net/ethernet/qlogic/qla3xxx.c b/drivers/net/ethernet/qlogic/qla3xxx.c
index a4bdff438a5..9416f297100 100644
--- a/drivers/net/ethernet/qlogic/qla3xxx.c
+++ b/drivers/net/ethernet/qlogic/qla3xxx.c
@@ -1735,10 +1735,12 @@ static void ql_get_drvinfo(struct net_device *ndev,
                            struct ethtool_drvinfo *drvinfo)
 {
         struct ql3_adapter *qdev = netdev_priv(ndev);
-        strncpy(drvinfo->driver, ql3xxx_driver_name, 32);
-        strncpy(drvinfo->version, ql3xxx_driver_version, 32);
-        strncpy(drvinfo->fw_version, "N/A", 32);
-        strncpy(drvinfo->bus_info, pci_name(qdev->pdev), 32);
+        strlcpy(drvinfo->driver, ql3xxx_driver_name, sizeof(drvinfo->driver));
+        strlcpy(drvinfo->version, ql3xxx_driver_version,
+                sizeof(drvinfo->version));
+        strlcpy(drvinfo->fw_version, "N/A", sizeof(drvinfo->fw_version));
+        strlcpy(drvinfo->bus_info, pci_name(qdev->pdev),
+                sizeof(drvinfo->bus_info));
         drvinfo->regdump_len = 0;
         drvinfo->eedump_len = 0;
 }
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c
index 8aa1c6e8667..cc228cf3d84 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
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c b/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c
index 9b67bfea035..8e2c2a74f3a 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c
+++ b/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c
@@ -366,13 +366,16 @@ static void ql_get_drvinfo(struct net_device *ndev,
                            struct ethtool_drvinfo *drvinfo)
 {
         struct ql_adapter *qdev = netdev_priv(ndev);
-        strncpy(drvinfo->driver, qlge_driver_name, 32);
-        strncpy(drvinfo->version, qlge_driver_version, 32);
-        snprintf(drvinfo->fw_version, 32, "v%d.%d.%d",
+        strlcpy(drvinfo->driver, qlge_driver_name, sizeof(drvinfo->driver));
+        strlcpy(drvinfo->version, qlge_driver_version,
+                sizeof(drvinfo->version));
+        snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version),
+                 "v%d.%d.%d",
                  (qdev->fw_rev_id & 0x00ff0000) >> 16,
                  (qdev->fw_rev_id & 0x0000ff00) >> 8,
                  (qdev->fw_rev_id & 0x000000ff));
-        strncpy(drvinfo->bus_info, pci_name(qdev->pdev), 32);
+        strlcpy(drvinfo->bus_info, pci_name(qdev->pdev),
+                sizeof(drvinfo->bus_info));
         drvinfo->n_stats = 0;
         drvinfo->testinfo_len = 0;
         if (!test_bit(QL_FRC_COREDUMP, &qdev->flags))