[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20120917105853.30298.29234.stgit@localhost.localdomain>
Date: Mon, 17 Sep 2012 11:58:55 +0100
From: Alan Cox <alan@...rguk.ukuu.org.uk>
To: netdev@...r.kernel.org
Subject: [PATCH] ncm: allow for NULL terminations
From: Alan Cox <alan@...ux.intel.com>
The strings are passed to snprintf so must be null terminated. It seems the
copy length is incorrectly set.
Signed-off-by: Alan Cox <alan@...ux.intel.com>
---
drivers/net/usb/cdc_ncm.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c
index 4cd582a..af8cce7 100644
--- a/drivers/net/usb/cdc_ncm.c
+++ b/drivers/net/usb/cdc_ncm.c
@@ -145,10 +145,10 @@ cdc_ncm_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->driver, dev->driver_name, sizeof(info->driver) - 1);
+ strncpy(info->version, DRIVER_VERSION, sizeof(info->version) - 1);
strncpy(info->fw_version, dev->driver_info->description,
- sizeof(info->fw_version));
+ sizeof(info->fw_version) - 1);
usb_make_path(dev->udev, info->bus_info, sizeof(info->bus_info));
}
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists