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/toshiba/tc35815.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/toshiba/tc35815.c')
-rw-r--r-- | drivers/net/ethernet/toshiba/tc35815.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/ethernet/toshiba/tc35815.c b/drivers/net/ethernet/toshiba/tc35815.c index 9819349eaa1e..23a789e86de4 100644 --- a/drivers/net/ethernet/toshiba/tc35815.c +++ b/drivers/net/ethernet/toshiba/tc35815.c | |||
@@ -1976,9 +1976,10 @@ tc35815_set_multicast_list(struct net_device *dev) | |||
1976 | static void tc35815_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) | 1976 | static void tc35815_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) |
1977 | { | 1977 | { |
1978 | struct tc35815_local *lp = netdev_priv(dev); | 1978 | struct tc35815_local *lp = netdev_priv(dev); |
1979 | strcpy(info->driver, MODNAME); | 1979 | |
1980 | strcpy(info->version, DRV_VERSION); | 1980 | strlcpy(info->driver, MODNAME, sizeof(info->driver)); |
1981 | strcpy(info->bus_info, pci_name(lp->pci_dev)); | 1981 | strlcpy(info->version, DRV_VERSION, sizeof(info->version)); |
1982 | strlcpy(info->bus_info, pci_name(lp->pci_dev), sizeof(info->bus_info)); | ||
1982 | } | 1983 | } |
1983 | 1984 | ||
1984 | static int tc35815_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) | 1985 | static int tc35815_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) |