Commit 86a2f415 authored by Phil Sutter's avatar Phil Sutter Committed by David S. Miller
Browse files

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: default avatarPhil Sutter <phil.sutter@viprinet.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0b3f0e7a

drivers/net/usb/usbnet.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

}