Commit 8556bceb authored by Wolfram Sang's avatar Wolfram Sang Committed by Florian Westphal
Browse files

netfilter: 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 avatarSimon Horman <horms@verge.net.au>
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
parent a0a4de4d

net/netfilter/ipset/ip_set_core.c

+2 −2
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ ip_set_init_comment(struct ip_set *set, struct ip_set_comment *comment, 
	c = kmalloc(sizeof(*c) + len + 1, GFP_ATOMIC);

	if (unlikely(!c))

		return;

	strlcpy(c->str, ext->comment, len + 1);

	strscpy(c->str, ext->comment, len + 1);

	set->ext_size += sizeof(*c) + strlen(c->str) + 1;

	rcu_assign_pointer(comment->c, c);

}
@@ -1072,7 +1072,7 @@ static int ip_set_create(struct sk_buff *skb, const struct nfnl_info *info, 
	if (!set)

		return -ENOMEM;

	spin_lock_init(&set->lock);

	strlcpy(set->name, name, IPSET_MAXNAMELEN);

	strscpy(set->name, name, IPSET_MAXNAMELEN);

	set->family = family;

	set->revision = revision;

net/netfilter/ipvs/ip_vs_ctl.c

+4 −4
Original line number Diff line number Diff line
@@ -2611,7 +2611,7 @@ ip_vs_copy_service(struct ip_vs_service_entry *dst, struct ip_vs_service *src) 
	dst->addr = src->addr.ip;

	dst->port = src->port;

	dst->fwmark = src->fwmark;

	strlcpy(dst->sched_name, sched_name, sizeof(dst->sched_name));

	strscpy(dst->sched_name, sched_name, sizeof(dst->sched_name));

	dst->flags = src->flags;

	dst->timeout = src->timeout / HZ;

	dst->netmask = src->netmask;
@@ -2805,13 +2805,13 @@ do_ip_vs_get_ctl(struct sock *sk, int cmd, void __user *user, int *len) 
		mutex_lock(&ipvs->sync_mutex);

		if (ipvs->sync_state & IP_VS_STATE_MASTER) {

			d[0].state = IP_VS_STATE_MASTER;

			strlcpy(d[0].mcast_ifn, ipvs->mcfg.mcast_ifn,

			strscpy(d[0].mcast_ifn, ipvs->mcfg.mcast_ifn,

				sizeof(d[0].mcast_ifn));

			d[0].syncid = ipvs->mcfg.syncid;

		}

		if (ipvs->sync_state & IP_VS_STATE_BACKUP) {

			d[1].state = IP_VS_STATE_BACKUP;

			strlcpy(d[1].mcast_ifn, ipvs->bcfg.mcast_ifn,

			strscpy(d[1].mcast_ifn, ipvs->bcfg.mcast_ifn,

				sizeof(d[1].mcast_ifn));

			d[1].syncid = ipvs->bcfg.syncid;

		}
@@ -3561,7 +3561,7 @@ static int ip_vs_genl_new_daemon(struct netns_ipvs *ipvs, struct nlattr **attrs) 
	      attrs[IPVS_DAEMON_ATTR_MCAST_IFN] &&

	      attrs[IPVS_DAEMON_ATTR_SYNC_ID]))

		return -EINVAL;

	strlcpy(c.mcast_ifn, nla_data(attrs[IPVS_DAEMON_ATTR_MCAST_IFN]),

	strscpy(c.mcast_ifn, nla_data(attrs[IPVS_DAEMON_ATTR_MCAST_IFN]),

		sizeof(c.mcast_ifn));

	c.syncid = nla_get_u32(attrs[IPVS_DAEMON_ATTR_SYNC_ID]);

net/netfilter/nf_log.c

+2 −2
Original line number Diff line number Diff line
@@ -443,9 +443,9 @@ static int nf_log_proc_dostring(struct ctl_table *table, int write, 
		mutex_lock(&nf_log_mutex);

		logger = nft_log_dereference(net->nf.nf_loggers[tindex]);

		if (!logger)

			strlcpy(buf, "NONE", sizeof(buf));

			strscpy(buf, "NONE", sizeof(buf));

		else

			strlcpy(buf, logger->name, sizeof(buf));

			strscpy(buf, logger->name, sizeof(buf));

		mutex_unlock(&nf_log_mutex);

		r = proc_dostring(&tmp, write, buffer, lenp, ppos);

	}

net/netfilter/nf_tables_api.c

+1 −1
Original line number Diff line number Diff line
@@ -742,7 +742,7 @@ __printf(2, 3) int nft_request_module(struct net *net, const char *fmt, 
		return -ENOMEM;



	req->done = false;

	strlcpy(req->module, module_name, MODULE_NAME_LEN);

	strscpy(req->module, module_name, MODULE_NAME_LEN);

	list_add_tail(&req->list, &nft_net->module_list);



	return -EAGAIN;

net/netfilter/nft_osf.c

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static void nft_osf_eval(const struct nft_expr *expr, struct nft_regs *regs, 
			snprintf(os_match, NFT_OSF_MAXGENRELEN, "%s:%s",

				 data.genre, data.version);

		else

			strlcpy(os_match, data.genre, NFT_OSF_MAXGENRELEN);

			strscpy(os_match, data.genre, NFT_OSF_MAXGENRELEN);



		strncpy((char *)dest, os_match, NFT_OSF_MAXGENRELEN);

	}