1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c b/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c
index 9b67bfea035f..8e2c2a74f3a5 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))