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/amd/au1000_eth.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/amd/au1000_eth.c')
-rw-r--r-- | drivers/net/ethernet/amd/au1000_eth.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/amd/au1000_eth.c b/drivers/net/ethernet/amd/au1000_eth.c index 2ea221ed4777..65b865a0cc78 100644 --- a/drivers/net/ethernet/amd/au1000_eth.c +++ b/drivers/net/ethernet/amd/au1000_eth.c | |||
@@ -587,10 +587,10 @@ au1000_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) | |||
587 | { | 587 | { |
588 | struct au1000_private *aup = netdev_priv(dev); | 588 | struct au1000_private *aup = netdev_priv(dev); |
589 | 589 | ||
590 | strcpy(info->driver, DRV_NAME); | 590 | strlcpy(info->driver, DRV_NAME, sizeof(info->driver)); |
591 | strcpy(info->version, DRV_VERSION); | 591 | strlcpy(info->version, DRV_VERSION, sizeof(info->version)); |
592 | info->fw_version[0] = '\0'; | 592 | snprintf(info->bus_info, sizeof(info->bus_info), "%s %d", DRV_NAME, |
593 | sprintf(info->bus_info, "%s %d", DRV_NAME, aup->mac_id); | 593 | aup->mac_id); |
594 | info->regdump_len = 0; | 594 | info->regdump_len = 0; |
595 | } | 595 | } |
596 | 596 | ||