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

dsa: 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: default avatarAndrew Lunn <andrew@lunn.ch>
Link: https://lore.kernel.org/r/20220818210216.8419-1-wsa+renesas@sang-engineering.com


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

net/dsa/master.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static void dsa_master_get_regs(struct net_device *dev, 
	}



	cpu_info = (struct ethtool_drvinfo *)data;

	strlcpy(cpu_info->driver, "dsa", sizeof(cpu_info->driver));

	strscpy(cpu_info->driver, "dsa", sizeof(cpu_info->driver));

	data += sizeof(*cpu_info);

	cpu_regs = (struct ethtool_regs *)data;

	data += sizeof(*cpu_regs);

net/dsa/slave.c

+3 −3
Original line number Diff line number Diff line
@@ -826,9 +826,9 @@ static netdev_tx_t dsa_slave_xmit(struct sk_buff *skb, struct net_device *dev) 
static void dsa_slave_get_drvinfo(struct net_device *dev,

				  struct ethtool_drvinfo *drvinfo)

{

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

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

	strlcpy(drvinfo->bus_info, "platform", sizeof(drvinfo->bus_info));

	strscpy(drvinfo->driver, "dsa", sizeof(drvinfo->driver));

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

	strscpy(drvinfo->bus_info, "platform", sizeof(drvinfo->bus_info));

}



static int dsa_slave_get_regs_len(struct net_device *dev)