Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23020ab3 authored by Rick Jones's avatar Rick Jones Committed by David S. Miller
Browse files

Sweep additional floors of strcpy in .get_drvinfo routines 



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: default avatarRick Jones <rick.jones2@hp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 952c5ca1

drivers/net/ethernet/amd/amd8111e.c

+5 −4
Original line number Diff line number Diff line
@@ -1412,10 +1412,11 @@ static void amd8111e_get_drvinfo(struct net_device* dev, struct ethtool_drvinfo 
{

	struct amd8111e_priv *lp = netdev_priv(dev);

	struct pci_dev *pci_dev = lp->pci_dev;

	strcpy (info->driver, MODULE_NAME);

	strcpy (info->version, MODULE_VERS);

	sprintf(info->fw_version,"%u",chip_version);

	strcpy (info->bus_info, pci_name(pci_dev));

	strlcpy(info->driver, MODULE_NAME, sizeof(info->driver));

	strlcpy(info->version, MODULE_VERS, sizeof(info->version));

	snprintf(info->fw_version, sizeof(info->fw_version),

		"%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)

drivers/net/ethernet/amd/pcnet32.c

+6 −4
Original line number Diff line number Diff line
@@ -711,12 +711,14 @@ static void pcnet32_get_drvinfo(struct net_device *dev, 
{

	struct pcnet32_private *lp = 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 (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

		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)

drivers/net/ethernet/chelsio/cxgb/cxgb2.c

+5 −4
Original line number Diff line number Diff line
@@ -434,10 +434,11 @@ static void get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) 
{

	struct adapter *adapter = dev->ml_priv;



	strcpy(info->driver, DRV_NAME);

	strcpy(info->version, DRV_VERSION);

	strcpy(info->fw_version, "N/A");

	strcpy(info->bus_info, pci_name(adapter->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(adapter->pdev),

		sizeof(info->bus_info));

}



static int get_sset_count(struct net_device *dev, int sset)

drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c

+5 −4
Original line number Diff line number Diff line
@@ -1576,11 +1576,12 @@ static void get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) 
	t3_get_tp_version(adapter, &tp_vers);

	spin_unlock(&adapter->stats_lock);



	strcpy(info->driver, DRV_NAME);

	strcpy(info->version, DRV_VERSION);

	strcpy(info->bus_info, pci_name(adapter->pdev));

	strlcpy(info->driver, DRV_NAME, sizeof(info->driver));

	strlcpy(info->version, DRV_VERSION, sizeof(info->version));

	strlcpy(info->bus_info, pci_name(adapter->pdev),

		sizeof(info->bus_info));

	if (!fw_vers)

		strcpy(info->fw_version, "N/A");

		strlcpy(info->fw_version, "N/A", sizeof(info->fw_version));

	else {

		snprintf(info->fw_version, sizeof(info->fw_version),

			 "%s %u.%u.%u TP %u.%u.%u",

drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c

+5 −4
Original line number Diff line number Diff line
@@ -1002,12 +1002,13 @@ static void get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) 
{

	struct adapter *adapter = netdev2adap(dev);



	strcpy(info->driver, KBUILD_MODNAME);

	strcpy(info->version, DRV_VERSION);

	strcpy(info->bus_info, pci_name(adapter->pdev));

	strlcpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));

	strlcpy(info->version, DRV_VERSION, sizeof(info->version));

	strlcpy(info->bus_info, pci_name(adapter->pdev),

		sizeof(info->bus_info));



	if (!adapter->params.fw_vers)

		strcpy(info->fw_version, "N/A");

		strlcpy(info->fw_version, "N/A", sizeof(info->fw_version));

	else

		snprintf(info->fw_version, sizeof(info->fw_version),

			"%u.%u.%u.%u, TP %u.%u.%u.%u",