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

caif: 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/20220818210214.8371-1-wsa+renesas@sang-engineering.com


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

net/caif/caif_dev.c

+1 −1
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ int caif_enroll_dev(struct net_device *dev, struct caif_dev_common *caifdev, 
	mutex_lock(&caifdevs->lock);

	list_add_rcu(&caifd->list, &caifdevs->list);



	strlcpy(caifd->layer.name, dev->name,

	strscpy(caifd->layer.name, dev->name,

		sizeof(caifd->layer.name));

	caifd->layer.transmit = transmit;

	res = cfcnfg_add_phy_layer(cfg,

net/caif/caif_usb.c

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ static int cfusbl_device_notify(struct notifier_block *me, unsigned long what, 
		dev_add_pack(&caif_usb_type);

	pack_added = true;



	strlcpy(layer->name, dev->name, sizeof(layer->name));

	strscpy(layer->name, dev->name, sizeof(layer->name));



	return 0;

err:

net/caif/cfcnfg.c

+2 −2
Original line number Diff line number Diff line
@@ -268,14 +268,14 @@ static int caif_connect_req_to_link_param(struct cfcnfg *cnfg, 
	case CAIFPROTO_RFM:

		l->linktype = CFCTRL_SRV_RFM;

		l->u.datagram.connid = s->sockaddr.u.rfm.connection_id;

		strlcpy(l->u.rfm.volume, s->sockaddr.u.rfm.volume,

		strscpy(l->u.rfm.volume, s->sockaddr.u.rfm.volume,

			sizeof(l->u.rfm.volume));

		break;

	case CAIFPROTO_UTIL:

		l->linktype = CFCTRL_SRV_UTIL;

		l->endpoint = 0x00;

		l->chtype = 0x00;

		strlcpy(l->u.utility.name, s->sockaddr.u.util.service,

		strscpy(l->u.utility.name, s->sockaddr.u.util.service,

			sizeof(l->u.utility.name));

		caif_assert(sizeof(l->u.utility.name) > 10);

		l->u.utility.paramlen = s->param.size;

net/caif/cfctrl.c

+1 −1
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ int cfctrl_linkup_request(struct cflayer *layer, 
		tmp16 = cpu_to_le16(param->u.utility.fifosize_bufs);

		cfpkt_add_body(pkt, &tmp16, 2);

		memset(utility_name, 0, sizeof(utility_name));

		strlcpy(utility_name, param->u.utility.name,

		strscpy(utility_name, param->u.utility.name,

			UTILITY_NAME_LENGTH);

		cfpkt_add_body(pkt, utility_name, UTILITY_NAME_LENGTH);

		tmp8 = param->u.utility.paramlen;