aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/ibm/ibmveth.c
diff options
context:
space:
mode:
authorJiri Pirko <jiri@resnulli.us>2013-01-05 19:44:26 -0500
committerDavid S. Miller <davem@davemloft.net>2013-01-07 00:06:31 -0500
commit7826d43f2db45c9305a6e0ba165650e1a203f517 (patch)
treea8659c995a37f58db809da9537aafac178431f31 /drivers/net/ethernet/ibm/ibmveth.c
parent2afb9b533423a9b97f84181e773cf9361d98fed6 (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/ibm/ibmveth.c')
-rw-r--r--drivers/net/ethernet/ibm/ibmveth.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/ibm/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c
index f2fdbb79837e..4181f6e99c00 100644
--- a/drivers/net/ethernet/ibm/ibmveth.c
+++ b/drivers/net/ethernet/ibm/ibmveth.c
@@ -722,9 +722,8 @@ static int netdev_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
722static void netdev_get_drvinfo(struct net_device *dev, 722static void netdev_get_drvinfo(struct net_device *dev,
723 struct ethtool_drvinfo *info) 723 struct ethtool_drvinfo *info)
724{ 724{
725 strncpy(info->driver, ibmveth_driver_name, sizeof(info->driver) - 1); 725 strlcpy(info->driver, ibmveth_driver_name, sizeof(info->driver));
726 strncpy(info->version, ibmveth_driver_version, 726 strlcpy(info->version, ibmveth_driver_version, sizeof(info->version));
727 sizeof(info->version) - 1);
728} 727}
729 728
730static netdev_features_t ibmveth_fix_features(struct net_device *dev, 729static netdev_features_t ibmveth_fix_features(struct net_device *dev,