diff options
| author | Jiri Pirko <jiri@resnulli.us> | 2013-01-06 01:44:26 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-01-07 06:06:31 +0100 |
| commit | 7826d43f2db45c9305a6e0ba165650e1a203f517 (patch) | |
| tree | a8659c995a37f58db809da9537aafac178431f31 /drivers/net/ethernet/ti/cpmac.c | |
| parent | ethtool: set addr_assign_type to NET_ADDR_SET when addr is passed on create (diff) | |
| download | linux-7826d43f2db45c9305a6e0ba165650e1a203f517.tar.xz linux-7826d43f2db45c9305a6e0ba165650e1a203f517.zip | |
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/ti/cpmac.c')
| -rw-r--r-- | drivers/net/ethernet/ti/cpmac.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/ethernet/ti/cpmac.c b/drivers/net/ethernet/ti/cpmac.c index d9625f62b026..70d1920cac97 100644 --- a/drivers/net/ethernet/ti/cpmac.c +++ b/drivers/net/ethernet/ti/cpmac.c @@ -904,10 +904,9 @@ static int cpmac_set_ringparam(struct net_device *dev, static void cpmac_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) { - strcpy(info->driver, "cpmac"); - strcpy(info->version, CPMAC_VERSION); - info->fw_version[0] = '\0'; - sprintf(info->bus_info, "%s", "cpmac"); + strlcpy(info->driver, "cpmac", sizeof(info->driver)); + strlcpy(info->version, CPMAC_VERSION, sizeof(info->version)); + snprintf(info->bus_info, sizeof(info->bus_info), "%s", "cpmac"); info->regdump_len = 0; } |