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

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


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

net/ipv6/ip6_gre.c

+1 −1
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ static struct ip6_tnl *ip6gre_tunnel_locate(struct net *net, 
	if (parms->name[0]) {

		if (!dev_valid_name(parms->name))

			return NULL;

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

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

	} else {

		strcpy(name, "ip6gre%d");

	}

net/ipv6/ip6_tunnel.c

+1 −1
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ static struct ip6_tnl *ip6_tnl_create(struct net *net, struct __ip6_tnl_parm *p) 
	if (p->name[0]) {

		if (!dev_valid_name(p->name))

			goto failed;

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

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

	} else {

		sprintf(name, "ip6tnl%%d");

	}

net/ipv6/ip6_vti.c

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ static struct ip6_tnl *vti6_tnl_create(struct net *net, struct __ip6_tnl_parm *p 
	if (p->name[0]) {

		if (!dev_valid_name(p->name))

			goto failed;

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

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

	} else {

		sprintf(name, "ip6_vti%%d");

	}

net/ipv6/sit.c

+1 −1
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ static struct ip_tunnel *ipip6_tunnel_locate(struct net *net, 
	if (parms->name[0]) {

		if (!dev_valid_name(parms->name))

			goto failed;

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

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

	} else {

		strcpy(name, "sit%d");

	}