Commit 70986397 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>
Link: https://lore.kernel.org/r/20220818210215.8395-1-wsa+renesas@sang-engineering.com


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

net/core/dev.c

+2 −2
Original line number Diff line number Diff line
@@ -1100,7 +1100,7 @@ static int dev_alloc_name_ns(struct net *net, 
	BUG_ON(!net);

	ret = __dev_alloc_name(net, name, buf);

	if (ret >= 0)

		strlcpy(dev->name, buf, IFNAMSIZ);

		strscpy(dev->name, buf, IFNAMSIZ);

	return ret;

}
@@ -1137,7 +1137,7 @@ static int dev_get_valid_name(struct net *net, struct net_device *dev, 
	else if (netdev_name_in_use(net, name))

		return -EEXIST;

	else if (dev->name != name)

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

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



	return 0;

}

net/core/drop_monitor.c

+1 −1
Original line number Diff line number Diff line
@@ -464,7 +464,7 @@ net_dm_hw_trap_summary_probe(void *ignore, const struct devlink *devlink, 
		goto out;



	hw_entry = &hw_entries->entries[hw_entries->num_entries];

	strlcpy(hw_entry->trap_name, metadata->trap_name,

	strscpy(hw_entry->trap_name, metadata->trap_name,

		NET_DM_MAX_HW_TRAP_NAME_LEN - 1);

	hw_entry->count = 1;

	hw_entries->num_entries++;

net/core/netpoll.c

+2 −2
Original line number Diff line number Diff line
@@ -556,7 +556,7 @@ int netpoll_parse_options(struct netpoll *np, char *opt) 
		if ((delim = strchr(cur, ',')) == NULL)

			goto parse_failed;

		*delim = 0;

		strlcpy(np->dev_name, cur, sizeof(np->dev_name));

		strscpy(np->dev_name, cur, sizeof(np->dev_name));

		cur = delim;

	}

	cur++;
@@ -610,7 +610,7 @@ int __netpoll_setup(struct netpoll *np, struct net_device *ndev) 
	int err;



	np->dev = ndev;

	strlcpy(np->dev_name, ndev->name, IFNAMSIZ);

	strscpy(np->dev_name, ndev->name, IFNAMSIZ);



	if (ndev->priv_flags & IFF_DISABLE_NETPOLL) {

		np_err(np, "%s doesn't support polling, aborting\n",