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
@@ -1227,10 +1227,11 @@ static const u32 unused_mib_regs[] = {
|
||||
static void bcm_enet_get_drvinfo(struct net_device *netdev,
|
||||
struct ethtool_drvinfo *drvinfo)
|
||||
{
|
||||
strncpy(drvinfo->driver, bcm_enet_driver_name, 32);
|
||||
strncpy(drvinfo->version, bcm_enet_driver_version, 32);
|
||||
strncpy(drvinfo->fw_version, "N/A", 32);
|
||||
strncpy(drvinfo->bus_info, "bcm63xx", 32);
|
||||
strlcpy(drvinfo->driver, bcm_enet_driver_name, sizeof(drvinfo->driver));
|
||||
strlcpy(drvinfo->version, bcm_enet_driver_version,
|
||||
sizeof(drvinfo->version));
|
||||
strlcpy(drvinfo->fw_version, "N/A", sizeof(drvinfo->fw_version));
|
||||
strlcpy(drvinfo->bus_info, "bcm63xx", sizeof(drvinfo->bus_info));
|
||||
drvinfo->n_stats = BCM_ENET_STATS_LEN;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user