diff options
| author | Phil Sutter <phil.sutter@viprinet.com> | 2012-06-14 01:18:42 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-06-17 16:20:31 -0700 |
| commit | 86a2f415e6cdc5dbb2163b31abf4d36f26f7e3da (patch) | |
| tree | deb47e0b1e7a5596e0faae054584188dd14303a9 /drivers/net/usb/usbnet.c | |
| parent | 0b3f0e7ae0765c81c7d659811595ea5058ae05a7 (diff) | |
| download | op-kernel-dev-86a2f415e6cdc5dbb2163b31abf4d36f26f7e3da.zip op-kernel-dev-86a2f415e6cdc5dbb2163b31abf4d36f26f7e3da.tar.gz | |
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb/usbnet.c')
| -rw-r--r-- | 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); } |
