Repository : ssh://git@open-mesh.org/batman-adv

On branch : master

commit efccb1977b070208ebca30656102d44ddab2397b Author: Jiri Pirko jiri@resnulli.us Date: Wed Jan 9 15:30:53 2013 +0800

batman-adv: 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 Signed-off-by: Marek Lindner lindner_marek@yahoo.de

efccb1977b070208ebca30656102d44ddab2397b soft-interface.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/soft-interface.c b/soft-interface.c index dbbf2b6..e67e013 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -585,10 +585,10 @@ static int batadv_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) static void batadv_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) { - strcpy(info->driver, "B.A.T.M.A.N. advanced"); - strcpy(info->version, BATADV_SOURCE_VERSION); - strcpy(info->fw_version, "N/A"); - strcpy(info->bus_info, "batman"); + strlcpy(info->driver, "B.A.T.M.A.N. advanced", sizeof(info->driver)); + strlcpy(info->version, BATADV_SOURCE_VERSION, sizeof(info->version)); + strlcpy(info->fw_version, "N/A", sizeof(info->fw_version)); + strlcpy(info->bus_info, "batman", sizeof(info->bus_info)); }

static u32 batadv_get_msglevel(struct net_device *dev)