diff options
author | Jiri Pirko <jiri@resnulli.us> | 2013-01-05 19:44:26 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-01-07 00:06:31 -0500 |
commit | 7826d43f2db45c9305a6e0ba165650e1a203f517 (patch) | |
tree | a8659c995a37f58db809da9537aafac178431f31 /drivers/net/ethernet/packetengines/yellowfin.c | |
parent | 2afb9b533423a9b97f84181e773cf9361d98fed6 (diff) |
ethtool: fix drvinfo strings set in drivers
Use strlcpy where possible to ensure the string is \0 terminated.
Use always sizeof(string) instead of 32, ETHTOOL_BUSINFO_LEN
and custom defines.
Use snprintf instead of sprint.
Remove unnecessary inits of ->fw_version
Remove unnecessary inits of drvinfo struct.
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/packetengines/yellowfin.c')
-rw-r--r-- | drivers/net/ethernet/packetengines/yellowfin.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/ethernet/packetengines/yellowfin.c b/drivers/net/ethernet/packetengines/yellowfin.c index fbaed4fa72fa..d28593b1fc3e 100644 --- a/drivers/net/ethernet/packetengines/yellowfin.c +++ b/drivers/net/ethernet/packetengines/yellowfin.c | |||
@@ -1326,9 +1326,10 @@ static void set_rx_mode(struct net_device *dev) | |||
1326 | static void yellowfin_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) | 1326 | static void yellowfin_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) |
1327 | { | 1327 | { |
1328 | struct yellowfin_private *np = netdev_priv(dev); | 1328 | struct yellowfin_private *np = netdev_priv(dev); |
1329 | strcpy(info->driver, DRV_NAME); | 1329 | |
1330 | strcpy(info->version, DRV_VERSION); | 1330 | strlcpy(info->driver, DRV_NAME, sizeof(info->driver)); |
1331 | strcpy(info->bus_info, pci_name(np->pci_dev)); | 1331 | strlcpy(info->version, DRV_VERSION, sizeof(info->version)); |
1332 | strlcpy(info->bus_info, pci_name(np->pci_dev), sizeof(info->bus_info)); | ||
1332 | } | 1333 | } |
1333 | 1334 | ||
1334 | static const struct ethtool_ops ethtool_ops = { | 1335 | static const struct ethtool_ops ethtool_ops = { |