Commit 94d30e89 authored by Xu Panda's avatar Xu Panda Committed by David S. Miller
Browse files

hns: use strscpy() to instead of strncpy() 



The implementation of strscpy() is more robust and safer.
That's now the recommended way to copy NUL terminated strings.

Signed-off-by: default avatarXu Panda <xu.panda@zte.com.cn>
Signed-off-by: default avatarYang Yang <yang.yang29@zte.com>
Reviewed-by: default avatarJiri Pirko <jiri@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6d534ee0

drivers/net/ethernet/hisilicon/hns/hns_ethtool.c

+4 −7
Original line number Diff line number Diff line
@@ -644,18 +644,15 @@ static void hns_nic_get_drvinfo(struct net_device *net_dev, 
{

	struct hns_nic_priv *priv = netdev_priv(net_dev);



	strncpy(drvinfo->version, HNAE_DRIVER_VERSION,

	strscpy(drvinfo->version, HNAE_DRIVER_VERSION,

		sizeof(drvinfo->version));

	drvinfo->version[sizeof(drvinfo->version) - 1] = '\0';



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

	drvinfo->driver[sizeof(drvinfo->driver) - 1] = '\0';

	strscpy(drvinfo->driver, HNAE_DRIVER_NAME, sizeof(drvinfo->driver));



	strncpy(drvinfo->bus_info, priv->dev->bus->name,

	strscpy(drvinfo->bus_info, priv->dev->bus->name,

		sizeof(drvinfo->bus_info));

	drvinfo->bus_info[ETHTOOL_BUSINFO_LEN - 1] = '\0';



	strncpy(drvinfo->fw_version, "N/A", ETHTOOL_FWVERS_LEN);

	strscpy(drvinfo->fw_version, "N/A", ETHTOOL_FWVERS_LEN);

	drvinfo->eedump_len = 0;

}