korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-16 16:54:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Sweep additional floors of strcpy in .get_drvinfo routines

Browse Source 
Perform another round of floor sweeping, converting the .get_drvinfo
routines of additional drivers from strcpy to strlcpy along with
some conversion of sprintf to snprintf.

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-09 09:58:07 +00:00 committed by David S. Miller
parent 952c5ca14e
commit 23020ab353
17 changed files with 74 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/ethernet/amd/amd8111e.c
View File

@ -1412,10 +1412,11 @@ static void amd8111e_get_drvinfo(struct net_device* dev, struct ethtool_drvinfo
{ {
struct amd8111e_priv *lp = netdev_priv(dev); struct amd8111e_priv *lp = netdev_priv(dev);
struct pci_dev *pci_dev = lp->pci_dev; struct pci_dev *pci_dev = lp->pci_dev;
strcpy (info->driver, MODULE_NAME); strlcpy(info->driver, MODULE_NAME, sizeof(info->driver));
strcpy (info->version, MODULE_VERS); strlcpy(info->version, MODULE_VERS, sizeof(info->version));
sprintf(info->fw_version,"%u",chip_version); snprintf(info->fw_version, sizeof(info->fw_version),
strcpy (info->bus_info, pci_name(pci_dev)); "%u", chip_version);
strlcpy(info->bus_info, pci_name(pci_dev), sizeof(info->bus_info));
} }
static int amd8111e_get_regs_len(struct net_device *dev) static int amd8111e_get_regs_len(struct net_device *dev)

10
drivers/net/ethernet/amd/pcnet32.c
View File

@ -711,12 +711,14 @@ static void pcnet32_get_drvinfo(struct net_device *dev,
{ {
struct pcnet32_private *lp = netdev_priv(dev); struct pcnet32_private *lp = 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));
if (lp->pci_dev) if (lp->pci_dev)
strcpy(info->bus_info, pci_name(lp->pci_dev)); strlcpy(info->bus_info, pci_name(lp->pci_dev),
sizeof(info->bus_info));
else else
sprintf(info->bus_info, "VLB 0x%lx", dev->base_addr); snprintf(info->bus_info, sizeof(info->bus_info),
"VLB 0x%lx", dev->base_addr);
} }
static u32 pcnet32_get_link(struct net_device *dev) static u32 pcnet32_get_link(struct net_device *dev)

9
drivers/net/ethernet/chelsio/cxgb/cxgb2.c
View File

@ -434,10 +434,11 @@ static void get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
{ {
struct adapter *adapter = dev->ml_priv; struct adapter *adapter = dev->ml_priv;
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));
strcpy(info->bus_info, pci_name(adapter->pdev)); strlcpy(info->bus_info, pci_name(adapter->pdev),
sizeof(info->bus_info));
} }
static int get_sset_count(struct net_device *dev, int sset) static int get_sset_count(struct net_device *dev, int sset)

9
drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
View File

@ -1576,11 +1576,12 @@ static void get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
t3_get_tp_version(adapter, &tp_vers); t3_get_tp_version(adapter, &tp_vers);
spin_unlock(&adapter->stats_lock); spin_unlock(&adapter->stats_lock);
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->bus_info, pci_name(adapter->pdev)); strlcpy(info->bus_info, pci_name(adapter->pdev),
sizeof(info->bus_info));
if (!fw_vers) if (!fw_vers)
strcpy(info->fw_version, "N/A"); strlcpy(info->fw_version, "N/A", sizeof(info->fw_version));
else { else {
snprintf(info->fw_version, sizeof(info->fw_version), snprintf(info->fw_version, sizeof(info->fw_version),
"%s %u.%u.%u TP %u.%u.%u", "%s %u.%u.%u TP %u.%u.%u",

9
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
View File

@ -1002,12 +1002,13 @@ static void get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
{ {
struct adapter *adapter = netdev2adap(dev); struct adapter *adapter = netdev2adap(dev);
strcpy(info->driver, KBUILD_MODNAME); strlcpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
strcpy(info->version, DRV_VERSION); strlcpy(info->version, DRV_VERSION, sizeof(info->version));
strcpy(info->bus_info, pci_name(adapter->pdev)); strlcpy(info->bus_info, pci_name(adapter->pdev),
sizeof(info->bus_info));
if (!adapter->params.fw_vers) if (!adapter->params.fw_vers)
strcpy(info->fw_version, "N/A"); strlcpy(info->fw_version, "N/A", sizeof(info->fw_version));
else else
snprintf(info->fw_version, sizeof(info->fw_version), snprintf(info->fw_version, sizeof(info->fw_version),
"%u.%u.%u.%u, TP %u.%u.%u.%u", "%u.%u.%u.%u, TP %u.%u.%u.%u",

7
drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
View File

@ -1203,9 +1203,10 @@ static void cxgb4vf_get_drvinfo(struct net_device *dev,
{ {
struct adapter *adapter = netdev2adap(dev); struct adapter *adapter = netdev2adap(dev);
strcpy(drvinfo->driver, KBUILD_MODNAME); strlcpy(drvinfo->driver, KBUILD_MODNAME, sizeof(drvinfo->driver));
strcpy(drvinfo->version, DRV_VERSION); strlcpy(drvinfo->version, DRV_VERSION, sizeof(drvinfo->version));
strcpy(drvinfo->bus_info, pci_name(to_pci_dev(dev->dev.parent))); strlcpy(drvinfo->bus_info, pci_name(to_pci_dev(dev->dev.parent)),
sizeof(drvinfo->bus_info));
snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version), snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version),
"%u.%u.%u.%u, TP %u.%u.%u.%u", "%u.%u.%u.%u, TP %u.%u.%u.%u",
FW_HDR_FW_VER_MAJOR_GET(adapter->params.dev.fwrev), FW_HDR_FW_VER_MAJOR_GET(adapter->params.dev.fwrev),

9
drivers/net/ethernet/intel/e100.c
View File

@ -2376,10 +2376,11 @@ static void e100_get_drvinfo(struct net_device *netdev,
struct ethtool_drvinfo *info) struct ethtool_drvinfo *info)
{ {
struct nic *nic = netdev_priv(netdev); struct nic *nic = netdev_priv(netdev);
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));
strcpy(info->bus_info, pci_name(nic->pdev)); strlcpy(info->bus_info, pci_name(nic->pdev),
sizeof(info->bus_info));
} }
#define E100_PHY_REGS 0x1C #define E100_PHY_REGS 0x1C

6
drivers/net/ethernet/jme.c
View File

@ -2292,9 +2292,9 @@ jme_get_drvinfo(struct net_device *netdev,
{ {
struct jme_adapter *jme = netdev_priv(netdev); struct jme_adapter *jme = netdev_priv(netdev);
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->bus_info, pci_name(jme->pdev)); strlcpy(info->bus_info, pci_name(jme->pdev), sizeof(info->bus_info));
} }
static int static int

7
drivers/net/ethernet/micrel/ksz884x.c
View File

@ -6093,9 +6093,10 @@ static void netdev_get_drvinfo(struct net_device *dev,
struct dev_priv *priv = netdev_priv(dev); struct dev_priv *priv = netdev_priv(dev);
struct dev_info *hw_priv = priv->adapter; struct dev_info *hw_priv = priv->adapter;
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->bus_info, pci_name(hw_priv->pdev)); strlcpy(info->bus_info, pci_name(hw_priv->pdev),
sizeof(info->bus_info));
} }
/** /**

9
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_ethtool.c
View File

@ -161,10 +161,11 @@ static void pch_gbe_get_drvinfo(struct net_device *netdev,
{ {
struct pch_gbe_adapter *adapter = netdev_priv(netdev); struct pch_gbe_adapter *adapter = netdev_priv(netdev);
strcpy(drvinfo->driver, KBUILD_MODNAME); strlcpy(drvinfo->driver, KBUILD_MODNAME, sizeof(drvinfo->driver));
strcpy(drvinfo->version, pch_driver_version); strlcpy(drvinfo->version, pch_driver_version, sizeof(drvinfo->version));
strcpy(drvinfo->fw_version, "N/A"); strlcpy(drvinfo->fw_version, "N/A", sizeof(drvinfo->fw_version));
strcpy(drvinfo->bus_info, pci_name(adapter->pdev)); strlcpy(drvinfo->bus_info, pci_name(adapter->pdev),
sizeof(drvinfo->bus_info));
drvinfo->regdump_len = pch_gbe_get_regs_len(netdev); drvinfo->regdump_len = pch_gbe_get_regs_len(netdev);
} }

7
drivers/net/ethernet/sis/sis190.c
View File

@ -1760,9 +1760,10 @@ static void sis190_get_drvinfo(struct net_device *dev,
{ {
struct sis190_private *tp = netdev_priv(dev); struct sis190_private *tp = 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->bus_info, pci_name(tp->pci_dev)); strlcpy(info->bus_info, pci_name(tp->pci_dev),
sizeof(info->bus_info));
} }
static int sis190_get_regs_len(struct net_device *dev) static int sis190_get_regs_len(struct net_device *dev)

7
drivers/net/ethernet/sis/sis900.c
View File

@ -1991,9 +1991,10 @@ static void sis900_get_drvinfo(struct net_device *net_dev,
{ {
struct sis900_private *sis_priv = netdev_priv(net_dev); struct sis900_private *sis_priv = netdev_priv(net_dev);
strcpy (info->driver, SIS900_MODULE_NAME); strlcpy(info->driver, SIS900_MODULE_NAME, sizeof(info->driver));
strcpy (info->version, SIS900_DRV_VERSION); strlcpy(info->version, SIS900_DRV_VERSION, sizeof(info->version));
strcpy (info->bus_info, pci_name(sis_priv->pci_dev)); strlcpy(info->bus_info, pci_name(sis_priv->pci_dev),
sizeof(info->bus_info));
} }
static u32 sis900_get_msglevel(struct net_device *net_dev) static u32 sis900_get_msglevel(struct net_device *net_dev)

9
drivers/net/ethernet/sun/niu.c
View File

@ -6823,12 +6823,13 @@ static void niu_get_drvinfo(struct net_device *dev,
struct niu *np = netdev_priv(dev); struct niu *np = netdev_priv(dev);
struct niu_vpd *vpd = &np->vpd; struct niu_vpd *vpd = &np->vpd;
strcpy(info->driver, DRV_MODULE_NAME); strlcpy(info->driver, DRV_MODULE_NAME, sizeof(info->driver));
strcpy(info->version, DRV_MODULE_VERSION); strlcpy(info->version, DRV_MODULE_VERSION, sizeof(info->version));
sprintf(info->fw_version, "%d.%d", snprintf(info->fw_version, sizeof(info->fw_version), "%d.%d",
vpd->fcode_major, vpd->fcode_minor); vpd->fcode_major, vpd->fcode_minor);
if (np->parent->plat_type != PLAT_TYPE_NIU) if (np->parent->plat_type != PLAT_TYPE_NIU)
strcpy(info->bus_info, pci_name(np->pdev)); strlcpy(info->bus_info, pci_name(np->pdev),
sizeof(info->bus_info));
} }
static int niu_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) static int niu_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)

6
drivers/net/ethernet/sun/sungem.c
View File

@ -2517,9 +2517,9 @@ static void gem_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info
{ {
struct gem *gp = netdev_priv(dev); struct gem *gp = 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->bus_info, pci_name(gp->pdev)); strlcpy(info->bus_info, pci_name(gp->pdev), sizeof(info->bus_info));
} }
static int gem_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) static int gem_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)

9
drivers/net/ethernet/sun/sunhme.c
View File

@ -2457,11 +2457,11 @@ static void hme_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info
{ {
struct happy_meal *hp = netdev_priv(dev); struct happy_meal *hp = netdev_priv(dev);
strcpy(info->driver, "sunhme"); strlcpy(info->driver, "sunhme", sizeof(info->driver));
strcpy(info->version, "2.02"); strlcpy(info->version, "2.02", sizeof(info->version));
if (hp->happy_flags & HFLAG_PCI) { if (hp->happy_flags & HFLAG_PCI) {
struct pci_dev *pdev = hp->happy_dev; struct pci_dev *pdev = hp->happy_dev;
strcpy(info->bus_info, pci_name(pdev)); strlcpy(info->bus_info, pci_name(pdev), sizeof(info->bus_info));
} }
#ifdef CONFIG_SBUS #ifdef CONFIG_SBUS
else { else {
@ -2469,7 +2469,8 @@ static void hme_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info
struct platform_device *op = hp->happy_dev; struct platform_device *op = hp->happy_dev;
regs = of_get_property(op->dev.of_node, "regs", NULL); regs = of_get_property(op->dev.of_node, "regs", NULL);
if (regs) if (regs)
sprintf(info->bus_info, "SBUS:%d", snprintf(info->bus_info, sizeof(info->bus_info),
"SBUS:%d",
regs->which_io); regs->which_io);
} }
#endif #endif

6
drivers/net/ethernet/via/via-rhine.c
View File

@ -2009,9 +2009,9 @@ static void netdev_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *i
{ {
struct rhine_private *rp = netdev_priv(dev); struct rhine_private *rp = 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->bus_info, pci_name(rp->pdev)); strlcpy(info->bus_info, pci_name(rp->pdev), sizeof(info->bus_info));
} }
static int netdev_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) static int netdev_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)

6
drivers/net/ethernet/via/via-velocity.c
View File

@ -3270,9 +3270,9 @@ static int velocity_set_settings(struct net_device *dev,
static void velocity_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) static void velocity_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
{ {
struct velocity_info *vptr = netdev_priv(dev); struct velocity_info *vptr = netdev_priv(dev);
strcpy(info->driver, VELOCITY_NAME); strlcpy(info->driver, VELOCITY_NAME, sizeof(info->driver));
strcpy(info->version, VELOCITY_VERSION); strlcpy(info->version, VELOCITY_VERSION, sizeof(info->version));
strcpy(info->bus_info, pci_name(vptr->pdev)); strlcpy(info->bus_info, pci_name(vptr->pdev), sizeof(info->bus_info));
} }
static void velocity_ethtool_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol) static void velocity_ethtool_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)