sweep the floors and convert some .get_drvinfo routines to strlcpy
Subsystems (24)
PATCH v2 1/1 sweep the floors and convert some .get_drvinfo routines to strlcpy
From: Rick Jones <[email protected]>
Per the mention made by Ben Hutchings that strlcpy is now the preferred string copy routine for a .get_drvinfo routine, do a bit of floor sweeping and convert some of the as-yet unconverted ethernet drivers to it.
Signed-off-by Rick Jones <[email protected]>
---
drivers/net/ethernet/3com/3c589_cs.c | 7 ++++--- drivers/net/ethernet/3com/3c59x.c | 12 +++++++----- drivers/net/ethernet/3com/typhoon.c | 16 +++++++++------- drivers/net/ethernet/8390/ne2k-pci.c | 6 +++--- drivers/net/ethernet/adaptec/starfire.c | 6 +++--- drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c | 10 ++++++---- drivers/net/ethernet/atheros/atlx/atl2.c | 10 ++++++---- drivers/net/ethernet/broadcom/bnx2.c | 8 ++++---- .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 8 ++++---- drivers/net/ethernet/broadcom/tg3.c | 8 ++++---- drivers/net/ethernet/brocade/bna/bnad_ethtool.c | 11 ++++++----- drivers/net/ethernet/dec/tulip/de2104x.c | 6 +++--- drivers/net/ethernet/dec/tulip/dmfe.c | 7 ++++--- drivers/net/ethernet/dec/tulip/tulip_core.c | 6 +++--- drivers/net/ethernet/dec/tulip/uli526x.c | 7 ++++--- drivers/net/ethernet/dec/tulip/winbond-840.c | 6 +++--- drivers/net/ethernet/dlink/sundance.c | 6 +++--- drivers/net/ethernet/dnet.c | 6 +++--- drivers/net/ethernet/emulex/benet/be_ethtool.c | 7 ++++--- drivers/net/ethernet/fealnx.c | 6 +++--- drivers/net/ethernet/i825xx/eepro.c | 7 ++++--- drivers/net/ethernet/marvell/mv643xx_eth.c | 9 +++++---- drivers/net/ethernet/marvell/skge.c | 9 +++++---- drivers/net/ethernet/marvell/sky2.c | 9 +++++---- drivers/net/ethernet/natsemi/natsemi.c | 6 +++--- drivers/net/ethernet/natsemi/ns83820.c | 6 +++--- drivers/net/ethernet/neterion/s2io.c | 8 ++++---- drivers/net/ethernet/nvidia/forcedeth.c | 6 +++--- .../ethernet/qlogic/netxen/netxen_nic_ethtool.c | 12 ++++++++---- drivers/net/ethernet/qlogic/qla3xxx.c | 10 ++++++---- .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 13 ++++++++----- drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c | 11 +++++++---- drivers/net/ethernet/realtek/8139cp.c | 6 +++--- drivers/net/ethernet/realtek/8139too.c | 6 +++--- drivers/net/ethernet/realtek/r8169.c | 10 +++++----- drivers/net/ethernet/smsc/epic100.c | 6 +++--- drivers/net/ethernet/smsc/smsc9420.c | 7 ++++--- drivers/net/ethernet/xircom/xirc2ps_cs.c | 2 +- 38 files changed, 166 insertions(+), 136 deletions(-)
drivers/net/ethernet/3com/3c589_cs.c +4 -3
@@ -468,9 +468,10 @@ static void tc589_reset(struct net_device *dev)static void netdev_get_drvinfo (struct net_device *dev,struct ethtool_drvinfo *info) { -strcpy (info->driver,DRV_NAME ); -strcpy (info->version,DRV_VERSION ); -sprintf (info->bus_info,"PCMCIA 0x%lx" , dev->base_addr); +strlcpy (info->driver,DRV_NAME ,sizeof (info->driver)); +strlcpy (info->version,DRV_VERSION ,sizeof (info->version)); +snprintf (info->bus_info,sizeof (info->bus_info), +"PCMCIA 0x%lx" , dev->base_addr); }static const struct ethtool_ops netdev_ethtool_ops = {
drivers/net/ethernet/3com/3c59x.c +7 -5
@@ -2929,15 +2929,17 @@ static void vortex_get_drvinfo(struct net_device *dev, {struct vortex_private *vp =netdev_priv (dev); -strcpy (info->driver,DRV_NAME ); +strlcpy (info->driver,DRV_NAME ,sizeof (info->driver));if (VORTEX_PCI (vp)) { -strcpy (info->bus_info,pci_name (VORTEX_PCI (vp))); +strlcpy (info->bus_info,pci_name (VORTEX_PCI (vp)), +sizeof (info->bus_info)); }else {if (VORTEX_EISA (vp)) -strcpy (info->bus_info,dev_name (vp->gendev)); +strlcpy (info->bus_info,dev_name (vp->gendev), +sizeof (info->bus_info));else -sprintf (info->bus_info,"EISA 0x%lx %d" , - dev->base_addr, dev->irq); +snprintf (info->bus_info,sizeof (info->bus_info), +"EISA 0x%lx %d" , dev->base_addr, dev->irq); } }
drivers/net/ethernet/3com/typhoon.c +9 -7
@@ -988,21 +988,23 @@ typhoon_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)smp_rmb ();if (tp->card_state == Sleeping) { -strcpy (info->fw_version,"Sleep image" ); +strlcpy (info->fw_version,"Sleep image" , +sizeof (info->fw_version)); }else {INIT_COMMAND_WITH_RESPONSE (&xp_cmd,TYPHOON_CMD_READ_VERSIONS );if (typhoon_issue_command (tp,1 , &xp_cmd,3 , xp_resp) <0 ) { -strcpy (info->fw_version,"Unknown runtime" ); +strlcpy (info->fw_version,"Unknown runtime" , +sizeof (info->fw_version)); }else {u32 sleep_ver =le32_to_cpu (xp_resp[0 ].parm2); -snprintf (info->fw_version,32 ,"%02x.%03x.%03x" , - sleep_ver >>24 , (sleep_ver >>12 ) &0xfff , - sleep_ver &0xfff ); +snprintf (info->fw_version,sizeof (info->fw_version), +"%02x.%03x.%03x" , sleep_ver >>24 , + (sleep_ver >>12 ) &0xfff , sleep_ver &0xfff ); } } -strcpy (info->driver,KBUILD_MODNAME ); -strcpy (info->bus_info,pci_name (pci_dev)); +strlcpy (info->driver,KBUILD_MODNAME ,sizeof (info->driver)); +strlcpy (info->bus_info,pci_name (pci_dev),sizeof (info->bus_info)); } static int
drivers/net/ethernet/8390/ne2k-pci.c +3 -3
@@ -639,9 +639,9 @@ static void ne2k_pci_get_drvinfo(struct net_device *dev,struct ei_device *ei =netdev_priv (dev);struct pci_dev *pci_dev = (struct pci_dev *) ei->priv; -strcpy (info->driver,DRV_NAME ); -strcpy (info->version,DRV_VERSION ); -strcpy (info->bus_info,pci_name (pci_dev)); +strlcpy (info->driver,DRV_NAME ,sizeof (info->driver)); +strlcpy (info->version,DRV_VERSION ,sizeof (info->version)); +strlcpy (info->bus_info,pci_name (pci_dev),sizeof (info->bus_info)); }static const struct ethtool_ops ne2k_pci_ethtool_ops = {
drivers/net/ethernet/adaptec/starfire.c +3 -3
@@ -1842,9 +1842,9 @@ static int check_if_running(struct net_device *dev)static void get_drvinfo (struct net_device *dev,struct ethtool_drvinfo *info) {struct netdev_private *np =netdev_priv (dev); -strcpy (info->driver,DRV_NAME ); -strcpy (info->version,DRV_VERSION ); -strcpy (info->bus_info,pci_name (np->pci_dev)); +strlcpy (info->driver,DRV_NAME ,sizeof (info->driver)); +strlcpy (info->version,DRV_VERSION ,sizeof (info->version)); +strlcpy (info->bus_info,pci_name (np->pci_dev),sizeof (info->bus_info)); }static int get_settings (struct net_device *dev,struct ethtool_cmd *ecmd)
drivers/net/ethernet/atheros/atl1e/atl1e_ethtool.c +6 -4
@@ -310,10 +310,12 @@ static void atl1e_get_drvinfo(struct net_device *netdev, {struct atl1e_adapter *adapter =netdev_priv (netdev); -strncpy (drvinfo->driver, atl1e_driver_name,32 ); -strncpy (drvinfo->version, atl1e_driver_version,32 ); -strncpy (drvinfo->fw_version,"L1e" ,32 ); -strncpy (drvinfo->bus_info,pci_name (adapter->pdev),32 ); +strlcpy (drvinfo->driver, atl1e_driver_name,sizeof (drvinfo->driver)); +strlcpy (drvinfo->version, atl1e_driver_version, +sizeof (drvinfo->version)); +strlcpy (drvinfo->fw_version,"L1e" ,sizeof (drvinfo->fw_version)); +strlcpy (drvinfo->bus_info,pci_name (adapter->pdev), +sizeof (drvinfo->bus_info)); drvinfo->n_stats =0 ; drvinfo->testinfo_len =0 ; drvinfo->regdump_len =atl1e_get_regs_len (netdev);
drivers/net/ethernet/atheros/atlx/atl2.c +6 -4
@@ -2049,10 +2049,12 @@ static void atl2_get_drvinfo(struct net_device *netdev, {struct atl2_adapter *adapter =netdev_priv (netdev); -strncpy (drvinfo->driver, atl2_driver_name,32 ); -strncpy (drvinfo->version, atl2_driver_version,32 ); -strncpy (drvinfo->fw_version,"L2" ,32 ); -strncpy (drvinfo->bus_info,pci_name (adapter->pdev),32 ); +strlcpy (drvinfo->driver, atl2_driver_name,sizeof (drvinfo->driver)); +strlcpy (drvinfo->version, atl2_driver_version, +sizeof (drvinfo->version)); +strlcpy (drvinfo->fw_version,"L2" ,sizeof (drvinfo->fw_version)); +strlcpy (drvinfo->bus_info,pci_name (adapter->pdev), +sizeof (drvinfo->bus_info)); drvinfo->n_stats =0 ; drvinfo->testinfo_len =0 ; drvinfo->regdump_len =atl2_get_regs_len (netdev);
drivers/net/ethernet/broadcom/bnx2.c +4 -4
@@ -6873,10 +6873,10 @@ bnx2_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) {struct bnx2 *bp =netdev_priv (dev); -strcpy (info->driver,DRV_MODULE_NAME ); -strcpy (info->version,DRV_MODULE_VERSION ); -strcpy (info->bus_info,pci_name (bp->pdev)); -strcpy (info->fw_version, bp->fw_version); +strlcpy (info->driver,DRV_MODULE_NAME ,sizeof (info->driver)); +strlcpy (info->version,DRV_MODULE_VERSION ,sizeof (info->version)); +strlcpy (info->bus_info,pci_name (bp->pdev),sizeof (info->bus_info)); +strlcpy (info->fw_version, bp->fw_version,sizeof (info->fw_version)); }#define BNX2_REGDUMP_LEN (32 * 1024)
drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c +4 -4
@@ -760,8 +760,8 @@ static void bnx2x_get_drvinfo(struct net_device *dev,struct bnx2x *bp =netdev_priv (dev);u8 phy_fw_ver[PHY_FW_VER_LEN ]; -strcpy (info->driver,DRV_MODULE_NAME ); -strcpy (info->version,DRV_MODULE_VERSION ); +strlcpy (info->driver,DRV_MODULE_NAME ,sizeof (info->driver)); +strlcpy (info->version,DRV_MODULE_VERSION ,sizeof (info->version)); phy_fw_ver[0 ] ='\0' ;if (bp->port.pmf) {
@@ -772,14 +772,14 @@ static void bnx2x_get_drvinfo(struct net_device *dev,bnx2x_release_phy_lock (bp); } -strncpy (info->fw_version, bp->fw_ver,32 ); +strlcpy (info->fw_version, bp->fw_ver,sizeof (info->fw_version));snprintf (info->fw_version +strlen (bp->fw_ver),32 -strlen (bp->fw_ver),"bc %d.%d.%d%s%s" , (bp->common.bc_ver &0xff0000 ) >>16 , (bp->common.bc_ver &0xff00 ) >>8 , (bp->common.bc_ver &0xff ), ((phy_fw_ver[0 ] !='\0' ) ?" phy " :"" ), phy_fw_ver); -strcpy (info->bus_info,pci_name (bp->pdev)); +strlcpy (info->bus_info,pci_name (bp->pdev),sizeof (info->bus_info)); info->n_stats =BNX2X_NUM_STATS ; info->testinfo_len =BNX2X_NUM_TESTS ; info->eedump_len = bp->common.flash_size;
drivers/net/ethernet/broadcom/tg3.c +4 -4
@@ -10419,10 +10419,10 @@ static void tg3_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info {struct tg3 *tp =netdev_priv (dev); -strcpy (info->driver,DRV_MODULE_NAME ); -strcpy (info->version,DRV_MODULE_VERSION ); -strcpy (info->fw_version, tp->fw_ver); -strcpy (info->bus_info,pci_name (tp->pdev)); +strlcpy (info->driver,DRV_MODULE_NAME ,sizeof (info->driver)); +strlcpy (info->version,DRV_MODULE_VERSION ,sizeof (info->version)); +strlcpy (info->fw_version, tp->fw_ver,sizeof (info->fw_version)); +strlcpy (info->bus_info,pci_name (tp->pdev),sizeof (info->bus_info)); }static void tg3_get_wol (struct net_device *dev,struct ethtool_wolinfo *wol)
drivers/net/ethernet/brocade/bna/bnad_ethtool.c +6 -5
@@ -296,8 +296,8 @@ bnad_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo)struct bfa_ioc_attr *ioc_attr;unsigned long flags; -strcpy (drvinfo->driver,BNAD_NAME ); -strcpy (drvinfo->version,BNAD_VERSION ); +strlcpy (drvinfo->driver,BNAD_NAME ,sizeof (drvinfo->driver)); +strlcpy (drvinfo->version,BNAD_VERSION ,sizeof (drvinfo->version)); ioc_attr =kzalloc (sizeof (*ioc_attr),GFP_KERNEL );if (ioc_attr) {
@@ -305,12 +305,13 @@ bnad_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo)bfa_nw_ioc_get_attr (&bnad->bna.ioceth.ioc, ioc_attr);spin_unlock_irqrestore (&bnad->bna_lock, flags); -strncpy (drvinfo->fw_version, ioc_attr->adapter_attr.fw_ver, -sizeof (drvinfo->fw_version) -1 ); +strlcpy (drvinfo->fw_version, ioc_attr->adapter_attr.fw_ver, +sizeof (drvinfo->fw_version));kfree (ioc_attr); } -strncpy (drvinfo->bus_info,pci_name (bnad->pcidev),ETHTOOL_BUSINFO_LEN ); +strlcpy (drvinfo->bus_info,pci_name (bnad->pcidev), +sizeof (drvinfo->bus_info)); } static void
drivers/net/ethernet/dec/tulip/de2104x.c +3 -3
@@ -1598,9 +1598,9 @@ static void de_get_drvinfo (struct net_device *dev,struct ethtool_drvinfo *info) {struct de_private *de =netdev_priv (dev); -strcpy (info->driver,DRV_NAME ); -strcpy (info->version,DRV_VERSION ); -strcpy (info->bus_info,pci_name (de->pdev)); +strlcpy (info->driver,DRV_NAME ,sizeof (info->driver)); +strlcpy (info->version,DRV_VERSION ,sizeof (info->version)); +strlcpy (info->bus_info,pci_name (de->pdev),sizeof (info->bus_info)); info->eedump_len =DE_EEPROM_SIZE ; }
drivers/net/ethernet/dec/tulip/dmfe.c +4 -3
@@ -1085,10 +1085,11 @@ static void dmfe_ethtool_get_drvinfo(struct net_device *dev, {struct dmfe_board_info *np =netdev_priv (dev); -strcpy (info->driver,DRV_NAME ); -strcpy (info->version,DRV_VERSION ); +strlcpy (info->driver,DRV_NAME ,sizeof (info->driver)); +strlcpy (info->version,DRV_VERSION ,sizeof (info->version));if (np->pdev) -strcpy (info->bus_info,pci_name (np->pdev)); +strlcpy (info->bus_info,pci_name (np->pdev), +sizeof (info->bus_info));else sprintf (info->bus_info,"EISA 0x%lx %d" , dev->base_addr, dev->irq);
drivers/net/ethernet/dec/tulip/tulip_core.c +3 -3
@@ -874,9 +874,9 @@ static struct net_device_stats *tulip_get_stats(struct net_device *dev)static void tulip_get_drvinfo (struct net_device *dev,struct ethtool_drvinfo *info) {struct tulip_private *np =netdev_priv (dev); -strcpy (info->driver,DRV_NAME ); -strcpy (info->version,DRV_VERSION ); -strcpy (info->bus_info,pci_name (np->pdev)); +strlcpy (info->driver,DRV_NAME ,sizeof (info->driver)); +strlcpy (info->version,DRV_VERSION ,sizeof (info->version)); +strlcpy (info->bus_info,pci_name (np->pdev),sizeof (info->bus_info)); }
drivers/net/ethernet/dec/tulip/uli526x.c +4 -3
@@ -960,10 +960,11 @@ static void netdev_get_drvinfo(struct net_device *dev, {struct uli526x_board_info *np =netdev_priv (dev); -strcpy (info->driver,DRV_NAME ); -strcpy (info->version,DRV_VERSION ); +strlcpy (info->driver,DRV_NAME ,sizeof (info->driver)); +strlcpy (info->version,DRV_VERSION ,sizeof (info->version));if (np->pdev) -strcpy (info->bus_info,pci_name (np->pdev)); +strlcpy (info->bus_info,pci_name (np->pdev), +sizeof (info->bus_info));else sprintf (info->bus_info,"EISA 0x%lx %d" , dev->base_addr, dev->irq);
drivers/net/ethernet/dec/tulip/winbond-840.c +3 -3
@@ -1390,9 +1390,9 @@ static void netdev_get_drvinfo (struct net_device *dev, struct ethtool_drvinfo * {struct netdev_private *np =netdev_priv (dev); -strcpy (info->driver,DRV_NAME ); -strcpy (info->version,DRV_VERSION ); -strcpy (info->bus_info,pci_name (np->pci_dev)); +strlcpy (info->driver,DRV_NAME ,sizeof (info->driver)); +strlcpy (info->version,DRV_VERSION ,sizeof (info->version)); +strlcpy (info->bus_info,pci_name (np->pci_dev),sizeof (info->bus_info)); }static int netdev_get_settings (struct net_device *dev,struct ethtool_cmd *cmd)
drivers/net/ethernet/dlink/sundance.c +3 -3
@@ -1634,9 +1634,9 @@ static int check_if_running(struct net_device *dev)static void get_drvinfo (struct net_device *dev,struct ethtool_drvinfo *info) {struct netdev_private *np =netdev_priv (dev); -strcpy (info->driver,DRV_NAME ); -strcpy (info->version,DRV_VERSION ); -strcpy (info->bus_info,pci_name (np->pci_dev)); +strlcpy (info->driver,DRV_NAME ,sizeof (info->driver)); +strlcpy (info->version,DRV_VERSION ,sizeof (info->version)); +strlcpy (info->bus_info,pci_name (np->pci_dev),sizeof (info->bus_info)); }static int get_settings (struct net_device *dev,struct ethtool_cmd *ecmd)
drivers/net/ethernet/dnet.c +3 -3
@@ -804,9 +804,9 @@ static int dnet_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)static void dnet_get_drvinfo (struct net_device *dev,struct ethtool_drvinfo *info) { -strcpy (info->driver,DRV_NAME ); -strcpy (info->version,DRV_VERSION ); -strcpy (info->bus_info,"0" ); +strlcpy (info->driver,DRV_NAME ,sizeof (info->driver)); +strlcpy (info->version,DRV_VERSION ,sizeof (info->version)); +strlcpy (info->bus_info,"0" ,sizeof (info->bus_info)); }static const struct ethtool_ops dnet_ethtool_ops = {
drivers/net/ethernet/emulex/benet/be_ethtool.c +4 -3
@@ -127,8 +127,8 @@ static void be_get_drvinfo(struct net_device *netdev,memset (fw_on_flash,0 ,sizeof (fw_on_flash));be_cmd_get_fw_ver (adapter, adapter->fw_ver, fw_on_flash); -strcpy (drvinfo->driver,DRV_NAME ); -strcpy (drvinfo->version,DRV_VER ); +strlcpy (drvinfo->driver,DRV_NAME ,sizeof (drvinfo->driver)); +strlcpy (drvinfo->version,DRV_VER ,sizeof (drvinfo->version));strncpy (drvinfo->fw_version, adapter->fw_ver,FW_VER_LEN );if (memcmp (adapter->fw_ver, fw_on_flash,FW_VER_LEN ) !=0 ) {strcat (drvinfo->fw_version," [" );
@@ -136,7 +136,8 @@ static void be_get_drvinfo(struct net_device *netdev,strcat (drvinfo->fw_version,"]" ); } -strcpy (drvinfo->bus_info,pci_name (adapter->pdev)); +strlcpy (drvinfo->bus_info,pci_name (adapter->pdev), +sizeof (drvinfo->bus_info)); drvinfo->testinfo_len =0 ; drvinfo->regdump_len =0 ; drvinfo->eedump_len =0 ;
drivers/net/ethernet/fealnx.c +3 -3
@@ -1818,9 +1818,9 @@ static void netdev_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *i {struct netdev_private *np =netdev_priv (dev); -strcpy (info->driver,DRV_NAME ); -strcpy (info->version,DRV_VERSION ); -strcpy (info->bus_info,pci_name (np->pci_dev)); +strlcpy (info->driver,DRV_NAME ,sizeof (info->driver)); +strlcpy (info->version,DRV_VERSION ,sizeof (info->version)); +strlcpy (info->bus_info,pci_name (np->pci_dev),sizeof (info->bus_info)); }static int netdev_get_settings (struct net_device *dev,struct ethtool_cmd *cmd)
drivers/net/ethernet/i825xx/eepro.c +4 -3
@@ -1726,9 +1726,10 @@ static int eepro_ethtool_get_settings(struct net_device *dev,static void eepro_ethtool_get_drvinfo (struct net_device *dev,struct ethtool_drvinfo *drvinfo) { -strcpy (drvinfo->driver,DRV_NAME ); -strcpy (drvinfo->version,DRV_VERSION ); -sprintf (drvinfo->bus_info,"ISA 0x%lx" , dev->base_addr); +strlcpy (drvinfo->driver,DRV_NAME ,sizeof (drvinfo->driver)); +strlcpy (drvinfo->version,DRV_VERSION ,sizeof (drvinfo->version)); +snprintf (drvinfo->bus_info,sizeof (drvinfo->bus_info), +"ISA 0x%lx" , dev->base_addr); }static const struct ethtool_ops eepro_ethtool_ops = {
drivers/net/ethernet/marvell/mv643xx_eth.c +5 -4
@@ -1502,10 +1502,11 @@ mv643xx_eth_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)static void mv643xx_eth_get_drvinfo (struct net_device *dev,struct ethtool_drvinfo *drvinfo) { -strncpy (drvinfo->driver, mv643xx_eth_driver_name,32 ); -strncpy (drvinfo->version, mv643xx_eth_driver_version,32 ); -strncpy (drvinfo->fw_version,"N/A" ,32 ); -strncpy (drvinfo->bus_info,"platform" ,32 ); +strlcpy (drvinfo->driver, mv643xx_eth_driver_name,sizeof (info->driver)); +strlcpy (drvinfo->version, mv643xx_eth_driver_version, +sizeof (info->version)); +strlcpy (drvinfo->fw_version,"N/A" ,sizeof (info->fw_version)); +strlcpy (drvinfo->bus_info,"platform" ,sizeof (info->bus_info)); drvinfo->n_stats =ARRAY_SIZE (mv643xx_eth_stats); }
drivers/net/ethernet/marvell/skge.c +5 -4
@@ -394,10 +394,11 @@ static void skge_get_drvinfo(struct net_device *dev, {struct skge_port *skge =netdev_priv (dev); -strcpy (info->driver,DRV_NAME ); -strcpy (info->version,DRV_VERSION ); -strcpy (info->fw_version,"N/A" ); -strcpy (info->bus_info,pci_name (skge->hw->pdev)); +strlcpy (info->driver,DRV_NAME ,sizeof (info->driver)); +strlcpy (info->version,DRV_VERSION ,sizeof (info->version)); +strlcpy (info->fw_version,"N/A" ,sizeof (info->fw_version)); +strlcpy (info->bus_info,pci_name (skge->hw->pdev), +sizeof (info->bus_info)); } static const struct skge_stat {
drivers/net/ethernet/marvell/sky2.c +5 -4
@@ -3634,10 +3634,11 @@ static void sky2_get_drvinfo(struct net_device *dev, {struct sky2_port *sky2 =netdev_priv (dev); -strcpy (info->driver,DRV_NAME ); -strcpy (info->version,DRV_VERSION ); -strcpy (info->fw_version,"N/A" ); -strcpy (info->bus_info,pci_name (sky2->hw->pdev)); +strlcpy (info->driver,DRV_NAME ,sizeof (info->driver)); +strlcpy (info->version,DRV_VERSION ,sizeof (info->version)); +strlcpy (info->fw_version,"N/A" ,sizeof (info->fw_version)); +strlcpy (info->bus_info,pci_name (sky2->hw->pdev), +sizeof (info->bus_info)); } static const struct sky2_stat {
drivers/net/ethernet/natsemi/natsemi.c +3 -3
@@ -2555,9 +2555,9 @@ static void set_rx_mode(struct net_device *dev)static void get_drvinfo (struct net_device *dev,struct ethtool_drvinfo *info) {struct netdev_private *np =netdev_priv (dev); -strncpy (info->driver,DRV_NAME ,ETHTOOL_BUSINFO_LEN ); -strncpy (info->version,DRV_VERSION ,ETHTOOL_BUSINFO_LEN ); -strncpy (info->bus_info,pci_name (np->pci_dev),ETHTOOL_BUSINFO_LEN ); +strlcpy (info->driver,DRV_NAME ,sizeof (info->driver)); +strlcpy (info->version,DRV_VERSION ,sizeof (info->version)); +strlcpy (info->bus_info,pci_name (np->pci_dev),sizeof (info->bus_info)); }static int get_regs_len (struct net_device *dev)
drivers/net/ethernet/natsemi/ns83820.c +3 -3
@@ -1364,9 +1364,9 @@ static int ns83820_set_settings(struct net_device *ndev,static void ns83820_get_drvinfo (struct net_device *ndev,struct ethtool_drvinfo *info) {struct ns83820 *dev =PRIV (ndev); -strcpy (info->driver,"ns83820" ); -strcpy (info->version,VERSION ); -strcpy (info->bus_info,pci_name (dev->pci_dev)); +strlcpy (info->driver,"ns83820" ,sizeof (info->driver)); +strlcpy (info->version,VERSION ,sizeof (info->version)); +strlcpy (info->bus_info,pci_name (dev->pci_dev),sizeof (info->bus_info)); }static u32 ns83820_get_link (struct net_device *ndev)
drivers/net/ethernet/neterion/s2io.c +4 -4
@@ -5391,10 +5391,10 @@ static void s2io_ethtool_gdrvinfo(struct net_device *dev, {struct s2io_nic *sp =netdev_priv (dev); -strncpy (info->driver, s2io_driver_name,sizeof (info->driver)); -strncpy (info->version, s2io_driver_version,sizeof (info->version)); -strncpy (info->fw_version,"" ,sizeof (info->fw_version)); -strncpy (info->bus_info,pci_name (sp->pdev),sizeof (info->bus_info)); +strlcpy (info->driver, s2io_driver_name,sizeof (info->driver)); +strlcpy (info->version, s2io_driver_version,sizeof (info->version)); +strlcpy (info->fw_version,"" ,sizeof (info->fw_version)); +strlcpy (info->bus_info,pci_name (sp->pdev),sizeof (info->bus_info)); info->regdump_len =XENA_REG_SPACE ; info->eedump_len =XENA_EEPROM_SPACE ; }
drivers/net/ethernet/nvidia/forcedeth.c +3 -3
@@ -3926,9 +3926,9 @@ static void nv_do_stats_poll(unsigned long data)static void nv_get_drvinfo (struct net_device *dev,struct ethtool_drvinfo *info) {struct fe_priv *np =netdev_priv (dev); -strcpy (info->driver,DRV_NAME ); -strcpy (info->version,FORCEDETH_VERSION ); -strcpy (info->bus_info,pci_name (np->pci_dev)); +strlcpy (info->driver,DRV_NAME ,sizeof (info->driver)); +strlcpy (info->version,FORCEDETH_VERSION ,sizeof (info->version)); +strlcpy (info->bus_info,pci_name (np->pci_dev),sizeof (info->bus_info)); }static void nv_get_wol (struct net_device *dev,struct ethtool_wolinfo *wolinfo)
drivers/net/ethernet/qlogic/netxen/netxen_nic_ethtool.c +8 -4
@@ -83,14 +83,18 @@ netxen_nic_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo)u32 fw_minor =0 ;u32 fw_build =0 ; -strncpy (drvinfo->driver, netxen_nic_driver_name,32 ); -strncpy (drvinfo->version,NETXEN_NIC_LINUX_VERSIONID ,32 ); +strlcpy (drvinfo->driver, netxen_nic_driver_name, +sizeof (drvinfo->driver)); +strlcpy (drvinfo->version,NETXEN_NIC_LINUX_VERSIONID , +sizeof (drvinfo->version)); fw_major =NXRD32 (adapter,NETXEN_FW_VERSION_MAJOR ); fw_minor =NXRD32 (adapter,NETXEN_FW_VERSION_MINOR ); fw_build =NXRD32 (adapter,NETXEN_FW_VERSION_SUB ); -sprintf (drvinfo->fw_version,"%d.%d.%d" , fw_major, fw_minor, fw_build); +snprintf (drvinfo->fw_version,sizeof (drvinfo->fw_version), +"%d.%d.%d" , fw_major, fw_minor, fw_build); -strncpy (drvinfo->bus_info,pci_name (adapter->pdev),32 ); +strlcpy (drvinfo->bus_info,pci_name (adapter->pdev), +sizeof (drvinfo->bus_info)); drvinfo->regdump_len =NETXEN_NIC_REGS_LEN ; drvinfo->eedump_len =netxen_nic_get_eeprom_len (dev); }
drivers/net/ethernet/qlogic/qla3xxx.c +6 -4
@@ -1735,10 +1735,12 @@ static void ql_get_drvinfo(struct net_device *ndev, struct ethtool_drvinfo *drvinfo) {struct ql3_adapter *qdev =netdev_priv (ndev); -strncpy (drvinfo->driver, ql3xxx_driver_name,32 ); -strncpy (drvinfo->version, ql3xxx_driver_version,32 ); -strncpy (drvinfo->fw_version,"N/A" ,32 ); -strncpy (drvinfo->bus_info,pci_name (qdev->pdev),32 ); +strlcpy (drvinfo->driver, ql3xxx_driver_name,sizeof (drvinfo->driver)); +strlcpy (drvinfo->version, ql3xxx_driver_version, +sizeof (drvinfo->version)); +strlcpy (drvinfo->fw_version,"N/A" ,sizeof (drvinfo->fw_version)); +strlcpy (drvinfo->bus_info,pci_name (qdev->pdev), +sizeof (drvinfo->bus_info)); drvinfo->regdump_len =0 ; drvinfo->eedump_len =0 ; }
drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c +8 -5
@@ -140,11 +140,14 @@ qlcnic_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo) fw_major =QLCRD32 (adapter,QLCNIC_FW_VERSION_MAJOR ); fw_minor =QLCRD32 (adapter,QLCNIC_FW_VERSION_MINOR ); fw_build =QLCRD32 (adapter,QLCNIC_FW_VERSION_SUB ); -sprintf (drvinfo->fw_version,"%d.%d.%d" , fw_major, fw_minor, fw_build); - -strlcpy (drvinfo->bus_info,pci_name (adapter->pdev),32 ); -strlcpy (drvinfo->driver, qlcnic_driver_name,32 ); -strlcpy (drvinfo->version,QLCNIC_LINUX_VERSIONID ,32 ); +snprintf (drvinfo->fw_version,sizeof (drvinfo->fw_version), +"%d.%d.%d" , fw_major, fw_minor, fw_build); + +strlcpy (drvinfo->bus_info,pci_name (adapter->pdev), +sizeof (drvinfo->bus_info)); +strlcpy (drvinfo->driver, qlcnic_driver_name,sizeof (drvinfo->driver)); +strlcpy (drvinfo->version,QLCNIC_LINUX_VERSIONID , +sizeof (drvinfo->version)); } static int
drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c +7 -4
@@ -366,13 +366,16 @@ static void ql_get_drvinfo(struct net_device *ndev, struct ethtool_drvinfo *drvinfo) {struct ql_adapter *qdev =netdev_priv (ndev); -strncpy (drvinfo->driver, qlge_driver_name,32 ); -strncpy (drvinfo->version, qlge_driver_version,32 ); -snprintf (drvinfo->fw_version,32 ,"v%d.%d.%d" , +strlcpy (drvinfo->driver, qlge_driver_name,sizeof (drvinfo->driver)); +strlcpy (drvinfo->version, qlge_driver_version, +sizeof (drvinfo->version)); +snprintf (drvinfo->fw_version,sizeof (drvinfo->fw_version), +"v%d.%d.%d" , (qdev->fw_rev_id &0x00ff0000 ) >>16 , (qdev->fw_rev_id &0x0000ff00 ) >>8 , (qdev->fw_rev_id &0x000000ff )); -strncpy (drvinfo->bus_info,pci_name (qdev->pdev),32 ); +strlcpy (drvinfo->bus_info,pci_name (qdev->pdev), +sizeof (drvinfo->bus_info)); drvinfo->n_stats =0 ; drvinfo->testinfo_len =0 ;if (!test_bit (QL_FRC_COREDUMP , &qdev->flags))
drivers/net/ethernet/realtek/8139cp.c +3 -3
@@ -1319,9 +1319,9 @@ static void cp_get_drvinfo (struct net_device *dev, struct ethtool_drvinfo *info {struct cp_private *cp =netdev_priv (dev); -strcpy (info->driver,DRV_NAME ); -strcpy (info->version,DRV_VERSION ); -strcpy (info->bus_info,pci_name (cp->pdev)); +strlcpy (info->driver,DRV_NAME ,sizeof (info->driver)); +strlcpy (info->version,DRV_VERSION ,sizeof (info->version)); +strlcpy (info->bus_info,pci_name (cp->pdev),sizeof (info->bus_info)); } static void cp_get_ringparam(struct net_device *dev,
drivers/net/ethernet/realtek/8139too.c +3 -3
@@ -2330,9 +2330,9 @@ static int rtl8139_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)static void rtl8139_get_drvinfo (struct net_device *dev,struct ethtool_drvinfo *info) {struct rtl8139_private *tp =netdev_priv (dev); -strcpy (info->driver,DRV_NAME ); -strcpy (info->version,DRV_VERSION ); -strcpy (info->bus_info,pci_name (tp->pci_dev)); +strlcpy (info->driver,DRV_NAME ,sizeof (info->driver)); +strlcpy (info->version,DRV_VERSION ,sizeof (info->version)); +strlcpy (info->bus_info,pci_name (tp->pci_dev),sizeof (info->bus_info)); info->regdump_len = tp->regs_len; }
drivers/net/ethernet/realtek/r8169.c +5 -5
@@ -1404,12 +1404,12 @@ static void rtl8169_get_drvinfo(struct net_device *dev,struct rtl8169_private *tp =netdev_priv (dev);struct rtl_fw *rtl_fw = tp->rtl_fw; -strcpy (info->driver,MODULENAME ); -strcpy (info->version,RTL8169_VERSION ); -strcpy (info->bus_info,pci_name (tp->pci_dev)); +strlcpy (info->driver,MODULENAME ,sizeof (info->driver)); +strlcpy (info->version,RTL8169_VERSION ,sizeof (info->version)); +strlcpy (info->bus_info,pci_name (tp->pci_dev),sizeof (info->bus_info));BUILD_BUG_ON (sizeof (info->fw_version) <sizeof (rtl_fw->version)); -strcpy (info->fw_version,IS_ERR_OR_NULL (rtl_fw) ?"N/A" : - rtl_fw->version); +strlcpy (info->fw_version,IS_ERR_OR_NULL (rtl_fw) ?"N/A" : + rtl_fw->version,sizeof (info->fw_version)); }static int rtl8169_get_regs_len (struct net_device *dev)
drivers/net/ethernet/smsc/epic100.c +3 -3
@@ -1414,9 +1414,9 @@ static void netdev_get_drvinfo (struct net_device *dev, struct ethtool_drvinfo * {struct epic_private *np =netdev_priv (dev); -strcpy (info->driver,DRV_NAME ); -strcpy (info->version,DRV_VERSION ); -strcpy (info->bus_info,pci_name (np->pci_dev)); +strlcpy (info->driver,DRV_NAME ,sizeof (info->driver)); +strlcpy (info->version,DRV_VERSION ,sizeof (info->version)); +strlcpy (info->bus_info,pci_name (np->pci_dev),sizeof (info->bus_info)); }static int netdev_get_settings (struct net_device *dev,struct ethtool_cmd *cmd)
drivers/net/ethernet/smsc/smsc9420.c +4 -3
@@ -278,9 +278,10 @@ static void smsc9420_ethtool_get_drvinfo(struct net_device *netdev, {struct smsc9420_pdata *pd =netdev_priv (netdev); -strcpy (drvinfo->driver,DRV_NAME ); -strcpy (drvinfo->bus_info,pci_name (pd->pdev)); -strcpy (drvinfo->version,DRV_VERSION ); +strlcpy (drvinfo->driver,DRV_NAME ,sizeof (drvinfo->driver)); +strlcpy (drvinfo->bus_info,pci_name (pd->pdev), +sizeof (drvinfo->bus_info)); +strlcpy (drvinfo->version,DRV_VERSION ,sizeof (drvinfo->version)); }static u32 smsc9420_ethtool_get_msglevel (struct net_device *netdev)
drivers/net/ethernet/xircom/xirc2ps_cs.c +1 -1
@@ -1411,7 +1411,7 @@ do_open(struct net_device *dev)static void netdev_get_drvinfo (struct net_device *dev,struct ethtool_drvinfo *info) { -strcpy (info->driver,"xirc2ps_cs" ); +strlcpy (info->driver,"xirc2ps_cs" ,sizeof (info->driver));sprintf (info->bus_info,"PCMCIA 0x%lx" , dev->base_addr); }
From: [email protected] (Rick Jones)
Date: Mon, 7 Nov 2011 15:29:27 -0800 (PST)
Quoted 8 lines
From: Rick Jones <[email protected]>
Per the mention made by Ben Hutchings that strlcpy is now the preferred string copy routine for a .get_drvinfo routine, do a bit of floor sweeping and convert some of the as-yet unconverted ethernet drivers to it.
Signed-off-by Rick Jones <[email protected]>
Applied.