48 lines
1.8 KiB
Diff
48 lines
1.8 KiB
Diff
From: Rick Jones <rick.jones2@hp.com>
|
|
Date: Mon, 7 Nov 2011 13:29:27 +0000
|
|
Subject: [PATCH 01/58] sweep the floors and convert some .get_drvinfo
|
|
routines to strlcpy
|
|
|
|
commit 68aad78c5023b8aa82da99b47f9d8cf40e8ca453 upstream.
|
|
|
|
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>
|
|
[bwh: Restrict to drivers/net/ethernet/emulex/benet/]
|
|
---
|
|
drivers/net/ethernet/emulex/benet/be_ethtool.c | 7 ++++---
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c
|
|
index bf8153e..1ad7a28 100644
|
|
--- a/drivers/net/ethernet/emulex/benet/be_ethtool.c
|
|
+++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c
|
|
@@ -127,8 +127,8 @@ static void be_get_drvinfo(struct net_device *netdev,
|
|
memset(fw_on_flash, 0 , sizeof(fw_on_flash));
|
|
be_cmd_get_fw_ver(adapter, adapter->fw_ver, fw_on_flash);
|
|
|
|
- strcpy(drvinfo->driver, DRV_NAME);
|
|
- strcpy(drvinfo->version, DRV_VER);
|
|
+ strlcpy(drvinfo->driver, DRV_NAME, sizeof(drvinfo->driver));
|
|
+ strlcpy(drvinfo->version, DRV_VER, sizeof(drvinfo->version));
|
|
strncpy(drvinfo->fw_version, adapter->fw_ver, FW_VER_LEN);
|
|
if (memcmp(adapter->fw_ver, fw_on_flash, FW_VER_LEN) != 0) {
|
|
strcat(drvinfo->fw_version, " [");
|
|
@@ -136,7 +136,8 @@ static void be_get_drvinfo(struct net_device *netdev,
|
|
strcat(drvinfo->fw_version, "]");
|
|
}
|
|
|
|
- strcpy(drvinfo->bus_info, pci_name(adapter->pdev));
|
|
+ strlcpy(drvinfo->bus_info, pci_name(adapter->pdev),
|
|
+ sizeof(drvinfo->bus_info));
|
|
drvinfo->testinfo_len = 0;
|
|
drvinfo->regdump_len = 0;
|
|
drvinfo->eedump_len = 0;
|
|
--
|
|
1.7.10
|
|
|