Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

net: sweep-up some straglers in strlcpy conversion of .get_drvinfo routines

Browse source 
Convert some remaining straglers' .get_drvinfo routines to use strlcpy
rather than strcpy/strncpy.

Signed-off-by: Rick Jones <rick.jones2@hp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Rick Jones 2011-11-15 14:59:53 +00:00 committed by David S. Miller
parent 588f033075
commit 33a5ba144e
7 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/net/ethernet/amd/nmclan_cs.c
View file

@ -822,9 +822,10 @@ static int mace_close(struct net_device *dev)
static void netdev_get_drvinfo(struct net_device *dev, static void netdev_get_drvinfo(struct net_device *dev,
struct ethtool_drvinfo *info) struct ethtool_drvinfo *info)
{ {
strcpy(info->driver, DRV_NAME); strlcpy(info->driver, DRV_NAME, sizeof(info->driver));
strcpy(info->version, DRV_VERSION); strlcpy(info->version, DRV_VERSION, sizeof(info->version));
sprintf(info->bus_info, "PCMCIA 0x%lx", dev->base_addr); snprintf(info->bus_info, sizeof(info->bus_info),
"PCMCIA 0x%lx", dev->base_addr);
} }
static const struct ethtool_ops netdev_ethtool_ops = { static const struct ethtool_ops netdev_ethtool_ops = {

7
drivers/net/ethernet/fujitsu/fmvj18x_cs.c
View file

@ -1058,9 +1058,10 @@ static void fjn_rx(struct net_device *dev)
static void netdev_get_drvinfo(struct net_device *dev, static void netdev_get_drvinfo(struct net_device *dev,
struct ethtool_drvinfo *info) struct ethtool_drvinfo *info)
{ {
strcpy(info->driver, DRV_NAME); strlcpy(info->driver, DRV_NAME, sizeof(info->driver));
strcpy(info->version, DRV_VERSION); strlcpy(info->version, DRV_VERSION, sizeof(info->version));
sprintf(info->bus_info, "PCMCIA 0x%lx", dev->base_addr); snprintf(info->bus_info, sizeof(info->bus_info),
"PCMCIA 0x%lx", dev->base_addr);
} }
static const struct ethtool_ops netdev_ethtool_ops = { static const struct ethtool_ops netdev_ethtool_ops = {

2
drivers/net/ethernet/intel/e1000e/ethtool.c
View file

@ -582,7 +582,7 @@ static void e1000_get_drvinfo(struct net_device *netdev,
strlcpy(drvinfo->driver, e1000e_driver_name, strlcpy(drvinfo->driver, e1000e_driver_name,
sizeof(drvinfo->driver)); sizeof(drvinfo->driver));
strncpy(drvinfo->version, e1000e_driver_version, strlcpy(drvinfo->version, e1000e_driver_version,
sizeof(drvinfo->version)); sizeof(drvinfo->version));
/* /*

4
drivers/net/ethernet/smsc/smc91c92_cs.c
View file

@ -1909,8 +1909,8 @@ static int check_if_running(struct net_device *dev)
static void smc_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) static void smc_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
{ {
strcpy(info->driver, DRV_NAME); strlcpy(info->driver, DRV_NAME, sizeof(info->driver));
strcpy(info->version, DRV_VERSION); strlcpy(info->version, DRV_VERSION, sizeof(info->version));
} }
static int smc_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd) static int smc_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)

5
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
View file

@ -185,9 +185,10 @@ static void stmmac_ethtool_getdrvinfo(struct net_device *dev,
struct stmmac_priv *priv = netdev_priv(dev); struct stmmac_priv *priv = netdev_priv(dev);
if (priv->plat->has_gmac) if (priv->plat->has_gmac)
strcpy(info->driver, GMAC_ETHTOOL_NAME); strlcpy(info->driver, GMAC_ETHTOOL_NAME, sizeof(info->driver));
else else
strcpy(info->driver, MAC100_ETHTOOL_NAME); strlcpy(info->driver, MAC100_ETHTOOL_NAME,
sizeof(info->driver));
strcpy(info->version, DRV_MODULE_VERSION); strcpy(info->version, DRV_MODULE_VERSION);
info->fw_version[0] = '\0'; info->fw_version[0] = '\0';

10
drivers/net/tun.c
View file

@ -1589,16 +1589,16 @@ static void tun_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info
{ {
struct tun_struct *tun = netdev_priv(dev); struct tun_struct *tun = netdev_priv(dev);
strcpy(info->driver, DRV_NAME); strlcpy(info->driver, DRV_NAME, sizeof(info->driver));
strcpy(info->version, DRV_VERSION); strlcpy(info->version, DRV_VERSION, sizeof(info->version));
strcpy(info->fw_version, "N/A"); strlcpy(info->fw_version, "N/A", sizeof(info->fw_version));
switch (tun->flags & TUN_TYPE_MASK) { switch (tun->flags & TUN_TYPE_MASK) {
case TUN_TUN_DEV: case TUN_TUN_DEV:
strcpy(info->bus_info, "tun"); strlcpy(info->bus_info, "tun", sizeof(info->bus_info));
break; break;
case TUN_TAP_DEV: case TUN_TAP_DEV:
strcpy(info->bus_info, "tap"); strlcpy(info->bus_info, "tap", sizeof(info->bus_info));
break; break;
} }
} }

6
drivers/net/veth.c
View file

@ -66,9 +66,9 @@ static int veth_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
static void veth_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) static void veth_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
{ {
strcpy(info->driver, DRV_NAME); strlcpy(info->driver, DRV_NAME, sizeof(info->driver));
strcpy(info->version, DRV_VERSION); strlcpy(info->version, DRV_VERSION, sizeof(info->version));
strcpy(info->fw_version, "N/A"); strlcpy(info->fw_version, "N/A", sizeof(info->fw_version));
} }
static void veth_get_strings(struct net_device *dev, u32 stringset, u8 *buf) static void veth_get_strings(struct net_device *dev, u32 stringset, u8 *buf)