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

Commit 612a94d6 authored by Rick Jones's avatar Rick Jones Committed by David S. Miller
Browse files

Sweep the last of the active .get_drvinfo floors under ethernet/ 



This round of floor sweeping converts strncpy calls in various .get_drvinfo
routines to the preferred strlcpy.  It also does a modicum of other
cleaning in those routines.

Signed-off-by: default avatarRick Jones <rick.jones2@hp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e52fcb24

drivers/net/ethernet/cisco/enic/enic_main.c

+4 −4
Original line number Diff line number Diff line
@@ -217,11 +217,11 @@ static void enic_get_drvinfo(struct net_device *netdev, 


	enic_dev_fw_info(enic, &fw_info);



	strncpy(drvinfo->driver, DRV_NAME, sizeof(drvinfo->driver));

	strncpy(drvinfo->version, DRV_VERSION, sizeof(drvinfo->version));

	strncpy(drvinfo->fw_version, fw_info->fw_version,

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

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

	strlcpy(drvinfo->fw_version, fw_info->fw_version,

		sizeof(drvinfo->fw_version));

	strncpy(drvinfo->bus_info, pci_name(enic->pdev),

	strlcpy(drvinfo->bus_info, pci_name(enic->pdev),

		sizeof(drvinfo->bus_info));

}

drivers/net/ethernet/intel/e1000/e1000_ethtool.c

+7 −6
Original line number Diff line number Diff line
@@ -515,14 +515,15 @@ static void e1000_get_drvinfo(struct net_device *netdev, 
			      struct ethtool_drvinfo *drvinfo)

{

	struct e1000_adapter *adapter = netdev_priv(netdev);

	char firmware_version[32];



	strncpy(drvinfo->driver,  e1000_driver_name, 32);

	strncpy(drvinfo->version, e1000_driver_version, 32);

	strlcpy(drvinfo->driver,  e1000_driver_name,

		sizeof(drvinfo->driver));

	strlcpy(drvinfo->version, e1000_driver_version,

		sizeof(drvinfo->version));



	sprintf(firmware_version, "N/A");

	strncpy(drvinfo->fw_version, firmware_version, 32);

	strncpy(drvinfo->bus_info, pci_name(adapter->pdev), 32);

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

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

		sizeof(drvinfo->bus_info));

	drvinfo->regdump_len = e1000_get_regs_len(netdev);

	drvinfo->eedump_len = e1000_get_eeprom_len(netdev);

}

drivers/net/ethernet/intel/e1000e/ethtool.c

+7 −9
Original line number Diff line number Diff line
@@ -579,26 +579,24 @@ static void e1000_get_drvinfo(struct net_device *netdev, 
			      struct ethtool_drvinfo *drvinfo)

{

	struct e1000_adapter *adapter = netdev_priv(netdev);

	char firmware_version[32];



	strncpy(drvinfo->driver,  e1000e_driver_name,

		sizeof(drvinfo->driver) - 1);

	strlcpy(drvinfo->driver,  e1000e_driver_name,

		sizeof(drvinfo->driver));

	strncpy(drvinfo->version, e1000e_driver_version,

		sizeof(drvinfo->version) - 1);

		sizeof(drvinfo->version));



	/*

	 * EEPROM image version # is reported as firmware version # for

	 * PCI-E controllers

	 */

	snprintf(firmware_version, sizeof(firmware_version), "%d.%d-%d",

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

		"%d.%d-%d",

		(adapter->eeprom_vers & 0xF000) >> 12,

		(adapter->eeprom_vers & 0x0FF0) >> 4,

		(adapter->eeprom_vers & 0x000F));



	strncpy(drvinfo->fw_version, firmware_version,

		sizeof(drvinfo->fw_version) - 1);

	strncpy(drvinfo->bus_info, pci_name(adapter->pdev),

		sizeof(drvinfo->bus_info) - 1);

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

		sizeof(drvinfo->bus_info));

	drvinfo->regdump_len = e1000_get_regs_len(netdev);

	drvinfo->eedump_len = e1000_get_eeprom_len(netdev);

}

drivers/net/ethernet/intel/igb/igb_ethtool.c

+6 −9
Original line number Diff line number Diff line
@@ -673,25 +673,22 @@ static void igb_get_drvinfo(struct net_device *netdev, 
			    struct ethtool_drvinfo *drvinfo)

{

	struct igb_adapter *adapter = netdev_priv(netdev);

	char firmware_version[32];

	u16 eeprom_data;



	strncpy(drvinfo->driver,  igb_driver_name, sizeof(drvinfo->driver) - 1);

	strncpy(drvinfo->version, igb_driver_version,

		sizeof(drvinfo->version) - 1);

	strlcpy(drvinfo->driver,  igb_driver_name, sizeof(drvinfo->driver));

	strlcpy(drvinfo->version, igb_driver_version, sizeof(drvinfo->version));



	/* EEPROM image version # is reported as firmware version # for

	 * 82575 controllers */

	adapter->hw.nvm.ops.read(&adapter->hw, 5, 1, &eeprom_data);

	sprintf(firmware_version, "%d.%d-%d",

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

		"%d.%d-%d",

		(eeprom_data & 0xF000) >> 12,

		(eeprom_data & 0x0FF0) >> 4,

		eeprom_data & 0x000F);



	strncpy(drvinfo->fw_version, firmware_version,

		sizeof(drvinfo->fw_version) - 1);

	strncpy(drvinfo->bus_info, pci_name(adapter->pdev),

		sizeof(drvinfo->bus_info) - 1);

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

		sizeof(drvinfo->bus_info));

	drvinfo->n_stats = IGB_STATS_LEN;

	drvinfo->testinfo_len = IGB_TEST_LEN;

	drvinfo->regdump_len = igb_get_regs_len(netdev);

drivers/net/ethernet/intel/igbvf/ethtool.c

+7 −5
Original line number Diff line number Diff line
@@ -191,12 +191,14 @@ static void igbvf_get_drvinfo(struct net_device *netdev, 
                              struct ethtool_drvinfo *drvinfo)

{

	struct igbvf_adapter *adapter = netdev_priv(netdev);

	char firmware_version[32] = "N/A";



	strncpy(drvinfo->driver,  igbvf_driver_name, 32);

	strncpy(drvinfo->version, igbvf_driver_version, 32);

	strncpy(drvinfo->fw_version, firmware_version, 32);

	strncpy(drvinfo->bus_info, pci_name(adapter->pdev), 32);

	strlcpy(drvinfo->driver,  igbvf_driver_name, sizeof(drvinfo->driver));

	strlcpy(drvinfo->version, igbvf_driver_version,

		sizeof(drvinfo->version));

	strlcpy(drvinfo->fw_version, "N/A",

		sizeof(drvinfo->fw_version));

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

		sizeof(drvinfo->bus_info));

	drvinfo->regdump_len = igbvf_get_regs_len(netdev);

	drvinfo->eedump_len = igbvf_get_eeprom_len(netdev);

}