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

net: 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>
Acked-by: Marc Kleine-Budde <mkl@pengutronix.de> # for CAN
Link: https://lore.kernel.org/r/20220830201457.7984-1-wsa+renesas@sang-engineering.com


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

drivers/net/Space.c

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ static int netdev_boot_setup_add(char *name, struct ifmap *map) 
	for (i = 0; i < NETDEV_BOOT_SETUP_MAX; i++) {

		if (s[i].name[0] == '\0' || s[i].name[0] == ' ') {

			memset(s[i].name, 0, sizeof(s[i].name));

			strlcpy(s[i].name, name, IFNAMSIZ);

			strscpy(s[i].name, name, IFNAMSIZ);

			memcpy(&s[i].map, map, sizeof(s[i].map));

			break;

		}

drivers/net/bonding/bond_main.c

+1 −1
Original line number Diff line number Diff line
@@ -5619,7 +5619,7 @@ static int bond_ethtool_get_link_ksettings(struct net_device *bond_dev, 
static void bond_ethtool_get_drvinfo(struct net_device *bond_dev,

				     struct ethtool_drvinfo *drvinfo)

{

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

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

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

		 BOND_ABI_VERSION);

}

drivers/net/can/sja1000/peak_pcmcia.c

+1 −1
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ static void pcan_free_channels(struct pcan_pccard *card) 
		if (!netdev)

			continue;



		strlcpy(name, netdev->name, IFNAMSIZ);

		strscpy(name, netdev->name, IFNAMSIZ);



		unregister_sja1000dev(netdev);

drivers/net/can/usb/peak_usb/pcan_usb_core.c

+1 −1
Original line number Diff line number Diff line
@@ -962,7 +962,7 @@ static void peak_usb_disconnect(struct usb_interface *intf) 


		dev_prev_siblings = dev->prev_siblings;

		dev->state &= ~PCAN_USB_STATE_CONNECTED;

		strlcpy(name, netdev->name, IFNAMSIZ);

		strscpy(name, netdev->name, IFNAMSIZ);



		unregister_netdev(netdev);

drivers/net/dsa/b53/b53_common.c

+1 −1
Original line number Diff line number Diff line
@@ -972,7 +972,7 @@ void b53_get_strings(struct dsa_switch *ds, int port, u32 stringset, 


	if (stringset == ETH_SS_STATS) {

		for (i = 0; i < mib_size; i++)

			strlcpy(data + i * ETH_GSTRING_LEN,

			strscpy(data + i * ETH_GSTRING_LEN,

				mibs[i].name, ETH_GSTRING_LEN);

	} else if (stringset == ETH_SS_PHY_STATS) {

		phydev = b53_get_phy_device(ds, port);