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>
This commit is contained in:

committed by
David S. Miller

parent
2afb9b5334
commit
7826d43f2d
@@ -1522,9 +1522,10 @@ smc911x_ethtool_setsettings(struct net_device *dev, struct ethtool_cmd *cmd)
|
||||
static void
|
||||
smc911x_ethtool_getdrvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
|
||||
{
|
||||
strncpy(info->driver, CARDNAME, sizeof(info->driver));
|
||||
strncpy(info->version, version, sizeof(info->version));
|
||||
strncpy(info->bus_info, dev_name(dev->dev.parent), sizeof(info->bus_info));
|
||||
strlcpy(info->driver, CARDNAME, sizeof(info->driver));
|
||||
strlcpy(info->version, version, sizeof(info->version));
|
||||
strlcpy(info->bus_info, dev_name(dev->dev.parent),
|
||||
sizeof(info->bus_info));
|
||||
}
|
||||
|
||||
static int smc911x_ethtool_nwayreset(struct net_device *dev)
|
||||
|
@@ -1597,9 +1597,10 @@ smc_ethtool_setsettings(struct net_device *dev, struct ethtool_cmd *cmd)
|
||||
static void
|
||||
smc_ethtool_getdrvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
|
||||
{
|
||||
strncpy(info->driver, CARDNAME, sizeof(info->driver));
|
||||
strncpy(info->version, version, sizeof(info->version));
|
||||
strncpy(info->bus_info, dev_name(dev->dev.parent), sizeof(info->bus_info));
|
||||
strlcpy(info->driver, CARDNAME, sizeof(info->driver));
|
||||
strlcpy(info->version, version, sizeof(info->version));
|
||||
strlcpy(info->bus_info, dev_name(dev->dev.parent),
|
||||
sizeof(info->bus_info));
|
||||
}
|
||||
|
||||
static int smc_ethtool_nwayreset(struct net_device *dev)
|
||||
|
Reference in New Issue
Block a user