usbnet: sanitise overlong driver information strings

As seen on smsc75xx, driver_info->description being longer than 32
characters messes up 'ethtool -i' output.

Signed-off-by: Phil Sutter <phil.sutter@viprinet.com>
---
 drivers/net/usb/usbnet.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

On Thu, 2012-06-14 at 13:18 +0200, Phil Sutter wrote:
> As seen on smsc75xx, driver_info->description being longer than 32
> characters messes up 'ethtool -i' output.

I should make ethtool tolerate that, but yes these are supposed to be
null-terminated strings.

Ben.

> Signed-off-by: Phil Sutter <phil.sutter@viprinet.com>
> ---
>  drivers/net/usb/usbnet.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
> index 9f58330..d4f7256 100644
> --- a/drivers/net/usb/usbnet.c
> +++ b/drivers/net/usb/usbnet.c
> @@ -876,9 +876,9 @@ void usbnet_get_drvinfo (struct net_device *net, struct ethtool_drvinfo *info)
>  {
>  	struct usbnet *dev = netdev_priv(net);
>  
> -	strncpy (info->driver, dev->driver_name, sizeof info->driver);
> -	strncpy (info->version, DRIVER_VERSION, sizeof info->version);
> -	strncpy (info->fw_version, dev->driver_info->description,
> +	strlcpy (info->driver, dev->driver_name, sizeof info->driver);
> +	strlcpy (info->version, DRIVER_VERSION, sizeof info->version);
> +	strlcpy (info->fw_version, dev->driver_info->description,
>  		sizeof info->fw_version);
>  	usb_make_path (dev->udev, info->bus_info, sizeof info->bus_info);
>  }

From: Phil Sutter <phil.sutter@viprinet.com>
Date: Thu, 14 Jun 2012 13:18:42 +0200

> As seen on smsc75xx, driver_info->description being longer than 32
> characters messes up 'ethtool -i' output.
> 
> Signed-off-by: Phil Sutter <phil.sutter@viprinet.com>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html