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 /net/batman-adv/soft-interface.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 'net/batman-adv/soft-interface.c')
-rw-r--r-- | net/batman-adv/soft-interface.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c index fa388b2c60d7..90f4049a90dd 100644 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c | |||
@@ -580,10 +580,10 @@ static int batadv_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) | |||
580 | static void batadv_get_drvinfo(struct net_device *dev, | 580 | static void batadv_get_drvinfo(struct net_device *dev, |
581 | struct ethtool_drvinfo *info) | 581 | struct ethtool_drvinfo *info) |
582 | { | 582 | { |
583 | strcpy(info->driver, "B.A.T.M.A.N. advanced"); | 583 | strlcpy(info->driver, "B.A.T.M.A.N. advanced", sizeof(info->driver)); |
584 | strcpy(info->version, BATADV_SOURCE_VERSION); | 584 | strlcpy(info->version, BATADV_SOURCE_VERSION, sizeof(info->version)); |
585 | strcpy(info->fw_version, "N/A"); | 585 | strlcpy(info->fw_version, "N/A", sizeof(info->fw_version)); |
586 | strcpy(info->bus_info, "batman"); | 586 | strlcpy(info->bus_info, "batman", sizeof(info->bus_info)); |
587 | } | 587 | } |
588 | 588 | ||
589 | static u32 batadv_get_msglevel(struct net_device *dev) | 589 | static u32 batadv_get_msglevel(struct net_device *dev) |