diff options
author | Rick Jones <rick.jones2@hp.com> | 2011-11-07 08:29:27 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-11-08 15:11:57 -0500 |
commit | 68aad78c5023b8aa82da99b47f9d8cf40e8ca453 (patch) | |
tree | c9f90903bd2e7831ea6fc5231affa3b9fc908b73 /drivers/net/ethernet/brocade | |
parent | 34d2d89f2d7da3b72b3157e778bbf709047ded97 (diff) |
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>
Diffstat (limited to 'drivers/net/ethernet/brocade')
-rw-r--r-- | drivers/net/ethernet/brocade/bna/bnad_ethtool.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/net/ethernet/brocade/bna/bnad_ethtool.c b/drivers/net/ethernet/brocade/bna/bnad_ethtool.c index fd3dcc1e9145..38d5c66075f9 100644 --- a/drivers/net/ethernet/brocade/bna/bnad_ethtool.c +++ b/drivers/net/ethernet/brocade/bna/bnad_ethtool.c | |||
@@ -296,8 +296,8 @@ bnad_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo) | |||
296 | struct bfa_ioc_attr *ioc_attr; | 296 | struct bfa_ioc_attr *ioc_attr; |
297 | unsigned long flags; | 297 | unsigned long flags; |
298 | 298 | ||
299 | strcpy(drvinfo->driver, BNAD_NAME); | 299 | strlcpy(drvinfo->driver, BNAD_NAME, sizeof(drvinfo->driver)); |
300 | strcpy(drvinfo->version, BNAD_VERSION); | 300 | strlcpy(drvinfo->version, BNAD_VERSION, sizeof(drvinfo->version)); |
301 | 301 | ||
302 | ioc_attr = kzalloc(sizeof(*ioc_attr), GFP_KERNEL); | 302 | ioc_attr = kzalloc(sizeof(*ioc_attr), GFP_KERNEL); |
303 | if (ioc_attr) { | 303 | if (ioc_attr) { |
@@ -305,12 +305,13 @@ bnad_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo) | |||
305 | bfa_nw_ioc_get_attr(&bnad->bna.ioceth.ioc, ioc_attr); | 305 | bfa_nw_ioc_get_attr(&bnad->bna.ioceth.ioc, ioc_attr); |
306 | spin_unlock_irqrestore(&bnad->bna_lock, flags); | 306 | spin_unlock_irqrestore(&bnad->bna_lock, flags); |
307 | 307 | ||
308 | strncpy(drvinfo->fw_version, ioc_attr->adapter_attr.fw_ver, | 308 | strlcpy(drvinfo->fw_version, ioc_attr->adapter_attr.fw_ver, |
309 | sizeof(drvinfo->fw_version) - 1); | 309 | sizeof(drvinfo->fw_version)); |
310 | kfree(ioc_attr); | 310 | kfree(ioc_attr); |
311 | } | 311 | } |
312 | 312 | ||
313 | strncpy(drvinfo->bus_info, pci_name(bnad->pcidev), ETHTOOL_BUSINFO_LEN); | 313 | strlcpy(drvinfo->bus_info, pci_name(bnad->pcidev), |
314 | sizeof(drvinfo->bus_info)); | ||
314 | } | 315 | } |
315 | 316 | ||
316 | static void | 317 | static void |