Commit f029c781 authored by Wolfram Sang's avatar Wolfram Sang Committed by Jakub Kicinski
Browse files

net: ethernet: move from strlcpy with unused retval to strscpy 

Follow the advice of the below link and prefer 'strscpy' in this
subsystem. Conversion is 1:1 because the return value is not used.
Generated by a coccinelle script.

Link: https://lore.kernel.org/r/CAHk-=wgfRnXz0W3D37d01q3JFkr_i_uTL=V6A6G1oUZcprmknw@mail.gmail.com/


Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Petr Machata <petrm@nvidia.com> # For drivers/net/ethernet/mellanox/mlxsw
Acked-by: Geoff Levand <geoff@infradead.org> # For ps3_gelic_net and spider_net_ethtool
Acked-by: Tom Lendacky <thomas.lendacky@amd.com> # For drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
Acked-by: Marcin Wojtas <mw@semihalf.com> # For drivers/net/ethernet/marvell/mvpp2
Reviewed-by: Leon Romanovsky <leonro@nvidia.com> # For drivers/net/ethernet/mellanox/mlx{4|5}
Reviewed-by: Shay Agroskin <shayagr@amazon.com> # For drivers/net/ethernet/amazon/ena
Acked-by: Krzysztof Hałasa <khalasa@piap.pl> # For IXP4xx Ethernet
Link: https://lore.kernel.org/r/20220830201457.7984-3-wsa+renesas@sang-engineering.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent fb3ceec1

drivers/net/ethernet/3com/3c509.c

+1 −1
Original line number Diff line number Diff line
@@ -1135,7 +1135,7 @@ el3_netdev_set_ecmd(struct net_device *dev, 


static void el3_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)

{

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

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

}



static int el3_get_link_ksettings(struct net_device *dev,

drivers/net/ethernet/3com/3c515.c

+1 −1
Original line number Diff line number Diff line
@@ -1527,7 +1527,7 @@ static void set_rx_mode(struct net_device *dev) 
static void netdev_get_drvinfo(struct net_device *dev,

			       struct ethtool_drvinfo *info)

{

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

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

	snprintf(info->bus_info, sizeof(info->bus_info), "ISA 0x%lx",

		 dev->base_addr);

}

drivers/net/ethernet/3com/3c589_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -480,7 +480,7 @@ static void tc589_reset(struct net_device *dev) 
static void netdev_get_drvinfo(struct net_device *dev,

			       struct ethtool_drvinfo *info)

{

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

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

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

		"PCMCIA 0x%lx", dev->base_addr);

}

drivers/net/ethernet/3com/3c59x.c

+3 −3
Original line number Diff line number Diff line
@@ -2959,13 +2959,13 @@ static void vortex_get_drvinfo(struct net_device *dev, 
{

	struct vortex_private *vp = netdev_priv(dev);



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

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

	if (VORTEX_PCI(vp)) {

		strlcpy(info->bus_info, pci_name(VORTEX_PCI(vp)),

		strscpy(info->bus_info, pci_name(VORTEX_PCI(vp)),

			sizeof(info->bus_info));

	} else {

		if (VORTEX_EISA(vp))

			strlcpy(info->bus_info, dev_name(vp->gendev),

			strscpy(info->bus_info, dev_name(vp->gendev),

				sizeof(info->bus_info));

		else

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

drivers/net/ethernet/3com/typhoon.c

+4 −4
Original line number Diff line number Diff line
@@ -969,12 +969,12 @@ typhoon_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) 


	smp_rmb();

	if (tp->card_state == Sleeping) {

		strlcpy(info->fw_version, "Sleep image",

		strscpy(info->fw_version, "Sleep image",

			sizeof(info->fw_version));

	} else {

		INIT_COMMAND_WITH_RESPONSE(&xp_cmd, TYPHOON_CMD_READ_VERSIONS);

		if (typhoon_issue_command(tp, 1, &xp_cmd, 3, xp_resp) < 0) {

			strlcpy(info->fw_version, "Unknown runtime",

			strscpy(info->fw_version, "Unknown runtime",

				sizeof(info->fw_version));

		} else {

			u32 sleep_ver = le32_to_cpu(xp_resp[0].parm2);
@@ -984,8 +984,8 @@ typhoon_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info) 
		}

	}



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

	strlcpy(info->bus_info, pci_name(pci_dev), sizeof(info->bus_info));

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

	strscpy(info->bus_info, pci_name(pci_dev), sizeof(info->bus_info));

}



static int