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>

3 files changed, 20 insertions, 15 deletions

diff --git a/drivers/net/ethernet/3com/3c589_cs.c b/drivers/net/ethernet/3com/3c589_cs.c
index 972f80ecc510..da410f036869 100644
--- a/drivers/net/ethernet/3com/3c589_cs.c
+++ b/drivers/net/ethernet/3com/3c589_cs.c
@@ -468,9 +468,10 @@ static void tc589_reset(struct net_device *dev)
 static void netdev_get_drvinfo(struct net_device *dev,
                                struct ethtool_drvinfo *info)
 {
-        strcpy(info->driver, DRV_NAME);
-        strcpy(info->version, DRV_VERSION);
-        sprintf(info->bus_info, "PCMCIA 0x%lx", dev->base_addr);
+        strlcpy(info->driver, DRV_NAME, sizeof(info->driver));
+        strlcpy(info->version, DRV_VERSION, sizeof(info->version));
+        snprintf(info->bus_info, sizeof(info->bus_info),
+                "PCMCIA 0x%lx", dev->base_addr);
 }
 
 static const struct ethtool_ops netdev_ethtool_ops = {
diff --git a/drivers/net/ethernet/3com/3c59x.c b/drivers/net/ethernet/3com/3c59x.c
index b42c06baba89..8153a3e0a1a4 100644
--- a/drivers/net/ethernet/3com/3c59x.c
+++ b/drivers/net/ethernet/3com/3c59x.c
@@ -2929,15 +2929,17 @@ static void vortex_get_drvinfo(struct net_device *dev,
 {
         struct vortex_private *vp = netdev_priv(dev);
 
-        strcpy(info->driver, DRV_NAME);
+        strlcpy(info->driver, DRV_NAME, sizeof(info->driver));
         if (VORTEX_PCI(vp)) {
-                strcpy(info->bus_info, pci_name(VORTEX_PCI(vp)));
+                strlcpy(info->bus_info, pci_name(VORTEX_PCI(vp)),
+                        sizeof(info->bus_info));
         } else {
                 if (VORTEX_EISA(vp))
-                        strcpy(info->bus_info, dev_name(vp->gendev));
+                        strlcpy(info->bus_info, dev_name(vp->gendev),
+                                sizeof(info->bus_info));
                 else
-                        sprintf(info->bus_info, "EISA 0x%lx %d",
-                                        dev->base_addr, dev->irq);
+                        snprintf(info->bus_info, sizeof(info->bus_info),
+                                "EISA 0x%lx %d", dev->base_addr, dev->irq);
         }
 }
 
diff --git a/drivers/net/ethernet/3com/typhoon.c b/drivers/net/ethernet/3com/typhoon.c
index 20ea07508ac7..6d6bc754b1a8 100644
--- a/drivers/net/ethernet/3com/typhoon.c
+++ b/drivers/net/ethernet/3com/typhoon.c
@@ -988,21 +988,23 @@ typhoon_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
 
         smp_rmb();
         if(tp->card_state == Sleeping) {
-                strcpy(info->fw_version, "Sleep image");
+                strlcpy(info->fw_version, "Sleep image",
+                        sizeof(info->fw_version));
         } else {
                 INIT_COMMAND_WITH_RESPONSE(&xp_cmd, TYPHOON_CMD_READ_VERSIONS);
                 if(typhoon_issue_command(tp, 1, &xp_cmd, 3, xp_resp) < 0) {
-                        strcpy(info->fw_version, "Unknown runtime");
+                        strlcpy(info->fw_version, "Unknown runtime",
+                                sizeof(info->fw_version));
                 } else {
                         u32 sleep_ver = le32_to_cpu(xp_resp[0].parm2);
-                        snprintf(info->fw_version, 32, "%02x.%03x.%03x",
-                                 sleep_ver >> 24, (sleep_ver >> 12) & 0xfff,
-                                 sleep_ver & 0xfff);
+                        snprintf(info->fw_version, sizeof(info->fw_version),
+                                "%02x.%03x.%03x", sleep_ver >> 24,
+                                (sleep_ver >> 12) & 0xfff, sleep_ver & 0xfff);
                 }
         }
 
-        strcpy(info->driver, KBUILD_MODNAME);
-        strcpy(info->bus_info, pci_name(pci_dev));
+        strlcpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
+        strlcpy(info->bus_info, pci_name(pci_dev), sizeof(info->bus_info));
 }
 
 static int