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

Commit 1f80c230 authored by Rick Jones's avatar Rick Jones Committed by John W. Linville
Browse files

wireless: use strlcpy routine in .get_drvinfo 



Convert various seemingly still compiled wireless drivers' .get_drvinfo
routines to use the preferred strlcpy() routine.

Signed-off-by: default avatarRick Jones <rick.jones2@hp.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 6048d763

drivers/net/wireless/hostap/hostap_ioctl.c

+2 −2
Original line number Diff line number Diff line
@@ -3871,8 +3871,8 @@ static void prism2_get_drvinfo(struct net_device *dev, 
	iface = netdev_priv(dev);

	local = iface->local;



	strncpy(info->driver, "hostap", sizeof(info->driver) - 1);

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

	strlcpy(info->driver, "hostap", sizeof(info->driver));

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

		 "%d.%d.%d", (local->sta_fw_ver >> 16) & 0xff,

		 (local->sta_fw_ver >> 8) & 0xff,

		 local->sta_fw_ver & 0xff);

drivers/net/wireless/ipw2x00/ipw2100.c

+4 −3
Original line number Diff line number Diff line
@@ -5981,8 +5981,8 @@ static void ipw_ethtool_get_drvinfo(struct net_device *dev, 
	struct ipw2100_priv *priv = libipw_priv(dev);

	char fw_ver[64], ucode_ver[64];



	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));



	ipw2100_get_fwversion(priv, fw_ver, sizeof(fw_ver));

	ipw2100_get_ucodeversion(priv, ucode_ver, sizeof(ucode_ver));
@@ -5990,7 +5990,8 @@ static void ipw_ethtool_get_drvinfo(struct net_device *dev, 
	snprintf(info->fw_version, sizeof(info->fw_version), "%s:%d:%s",

		 fw_ver, priv->eeprom_version, ucode_ver);



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

	strlcpy(info->bus_info, pci_name(priv->pci_dev),

		sizeof(info->bus_info));

}



static u32 ipw2100_ethtool_get_link(struct net_device *dev)

drivers/net/wireless/ipw2x00/ipw2200.c

+4 −3
Original line number Diff line number Diff line
@@ -10548,8 +10548,8 @@ static void ipw_ethtool_get_drvinfo(struct net_device *dev, 
	char date[32];

	u32 len;



	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));



	len = sizeof(vers);

	ipw_get_ordinal(p, IPW_ORD_STAT_FW_VERSION, vers, &len);
@@ -10558,7 +10558,8 @@ static void ipw_ethtool_get_drvinfo(struct net_device *dev, 


	snprintf(info->fw_version, sizeof(info->fw_version), "%s (%s)",

		 vers, date);

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

	strlcpy(info->bus_info, pci_name(p->pci_dev),

		sizeof(info->bus_info));

	info->eedump_len = IPW_EEPROM_IMAGE_SIZE;

}

drivers/net/wireless/libertas/ethtool.c

+4 −3
Original line number Diff line number Diff line
@@ -13,13 +13,14 @@ static void lbs_ethtool_get_drvinfo(struct net_device *dev, 
{

	struct lbs_private *priv = dev->ml_priv;



	snprintf(info->fw_version, 32, "%u.%u.%u.p%u",

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

		"%u.%u.%u.p%u",

		priv->fwrelease >> 24 & 0xff,

		priv->fwrelease >> 16 & 0xff,

		priv->fwrelease >>  8 & 0xff,

		priv->fwrelease       & 0xff);

	strcpy(info->driver, "libertas");

	strcpy(info->version, lbs_driver_version);

	strlcpy(info->driver, "libertas", sizeof(info->driver));

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

}



/*

drivers/net/wireless/prism54/islpci_dev.c

+2 −2
Original line number Diff line number Diff line
@@ -793,8 +793,8 @@ islpci_set_multicast_list(struct net_device *dev) 
static void islpci_ethtool_get_drvinfo(struct net_device *dev,

                                       struct ethtool_drvinfo *info)

{

	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));

}



static const struct ethtool_ops islpci_ethtool_ops = {