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

Commit 7826d43f authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

ethtool: fix drvinfo strings set in drivers 



Use strlcpy where possible to ensure the string is \0 terminated.
Use always sizeof(string) instead of 32, ETHTOOL_BUSINFO_LEN
and custom defines.
Use snprintf instead of sprint.
Remove unnecessary inits of ->fw_version
Remove unnecessary inits of drvinfo struct.

Signed-off-by: default avatarJiri Pirko <jiri@resnulli.us>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2afb9b53

arch/um/drivers/net_kern.c

+2 −2
Original line number Diff line number Diff line
@@ -274,8 +274,8 @@ static void uml_net_poll_controller(struct net_device *dev) 
static void uml_net_get_drvinfo(struct net_device *dev,

				struct ethtool_drvinfo *info)

{

	strcpy(info->driver, DRIVER_NAME);

	strcpy(info->version, "42");

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

	strlcpy(info->version, "42", sizeof(info->version));

}



static const struct ethtool_ops uml_net_ethtool_ops = {

drivers/infiniband/hw/nes/nes_nic.c

+7 −5
Original line number Diff line number Diff line
@@ -1317,11 +1317,13 @@ static void nes_netdev_get_drvinfo(struct net_device *netdev, 
	struct nes_vnic *nesvnic = netdev_priv(netdev);

	struct nes_adapter *nesadapter = nesvnic->nesdev->nesadapter;



	strcpy(drvinfo->driver, DRV_NAME);

	strcpy(drvinfo->bus_info, pci_name(nesvnic->nesdev->pcidev));

	sprintf(drvinfo->fw_version, "%u.%u", nesadapter->firmware_version>>16,

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

	strlcpy(drvinfo->bus_info, pci_name(nesvnic->nesdev->pcidev),

		sizeof(drvinfo->bus_info));

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

		 "%u.%u", nesadapter->firmware_version >> 16,

		 nesadapter->firmware_version & 0x000000ff);

	strcpy(drvinfo->version, DRV_VERSION);

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

	drvinfo->testinfo_len = 0;

	drvinfo->eedump_len = 0;

	drvinfo->regdump_len = 0;

drivers/infiniband/ulp/ipoib/ipoib_ethtool.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
static void ipoib_get_drvinfo(struct net_device *netdev,

			      struct ethtool_drvinfo *drvinfo)

{

	strncpy(drvinfo->driver, "ipoib", sizeof(drvinfo->driver) - 1);

	strlcpy(drvinfo->driver, "ipoib", sizeof(drvinfo->driver));

}



static int ipoib_get_coalesce(struct net_device *dev,

drivers/net/bonding/bond_main.c

+5 −4
Original line number Diff line number Diff line
@@ -4332,9 +4332,10 @@ void bond_set_mode_ops(struct bonding *bond, int mode) 
static void bond_ethtool_get_drvinfo(struct net_device *bond_dev,

				     struct ethtool_drvinfo *drvinfo)

{

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

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

	snprintf(drvinfo->fw_version, 32, "%d", BOND_ABI_VERSION);

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

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

	snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version), "%d",

		 BOND_ABI_VERSION);

}



static const struct ethtool_ops bond_ethtool_ops = {

drivers/net/cris/eth_v10.c

+4 −4
Original line number Diff line number Diff line
@@ -1448,10 +1448,10 @@ static int e100_set_settings(struct net_device *dev, 
static void e100_get_drvinfo(struct net_device *dev,

			     struct ethtool_drvinfo *info)

{

	strncpy(info->driver, "ETRAX 100LX", sizeof(info->driver) - 1);

	strncpy(info->version, "$Revision: 1.31 $", sizeof(info->version) - 1);

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

	strncpy(info->bus_info, "N/A", sizeof(info->bus_info) - 1);

	strlcpy(info->driver, "ETRAX 100LX", sizeof(info->driver));

	strlcpy(info->version, "$Revision: 1.31 $", sizeof(info->version));

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

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

}



static int e100_nway_reset(struct net_device *dev)