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/korina.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/korina.c')
-rw-r--r-- | drivers/net/ethernet/korina.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/korina.c b/drivers/net/ethernet/korina.c index bc58f1dc22f5..5409fe876a44 100644 --- a/drivers/net/ethernet/korina.c +++ b/drivers/net/ethernet/korina.c | |||
@@ -695,9 +695,9 @@ static void netdev_get_drvinfo(struct net_device *dev, | |||
695 | { | 695 | { |
696 | struct korina_private *lp = netdev_priv(dev); | 696 | struct korina_private *lp = netdev_priv(dev); |
697 | 697 | ||
698 | strcpy(info->driver, DRV_NAME); | 698 | strlcpy(info->driver, DRV_NAME, sizeof(info->driver)); |
699 | strcpy(info->version, DRV_VERSION); | 699 | strlcpy(info->version, DRV_VERSION, sizeof(info->version)); |
700 | strcpy(info->bus_info, lp->dev->name); | 700 | strlcpy(info->bus_info, lp->dev->name, sizeof(info->bus_info)); |
701 | } | 701 | } |
702 | 702 | ||
703 | static int netdev_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) | 703 | static int netdev_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) |