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/i825xx/3c507.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/i825xx/3c507.c')
-rw-r--r-- | drivers/net/ethernet/i825xx/3c507.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/ethernet/i825xx/3c507.c b/drivers/net/ethernet/i825xx/3c507.c index e8984b059905..13983ee6bcf8 100644 --- a/drivers/net/ethernet/i825xx/3c507.c +++ b/drivers/net/ethernet/i825xx/3c507.c | |||
@@ -888,9 +888,10 @@ static void el16_rx(struct net_device *dev) | |||
888 | static void netdev_get_drvinfo(struct net_device *dev, | 888 | static void netdev_get_drvinfo(struct net_device *dev, |
889 | struct ethtool_drvinfo *info) | 889 | struct ethtool_drvinfo *info) |
890 | { | 890 | { |
891 | strcpy(info->driver, DRV_NAME); | 891 | strlcpy(info->driver, DRV_NAME, sizeof(info->driver)); |
892 | strcpy(info->version, DRV_VERSION); | 892 | strlcpy(info->version, DRV_VERSION, sizeof(info->version)); |
893 | sprintf(info->bus_info, "ISA 0x%lx", dev->base_addr); | 893 | snprintf(info->bus_info, sizeof(info->bus_info), "ISA 0x%lx", |
894 | dev->base_addr); | ||
894 | } | 895 | } |
895 | 896 | ||
896 | static u32 netdev_get_msglevel(struct net_device *dev) | 897 | static u32 netdev_get_msglevel(struct net_device *dev) |