Commit 0dd7439f authored by Wolfram Sang's avatar Wolfram Sang Committed by Anna Schumaker
Browse files

NFS: 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>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 15bcdc92

fs/nfs/nfs4client.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -254,7 +254,7 @@ struct nfs_client *nfs4_alloc_client(const struct nfs_client_initdata *cl_init) 
			goto error;

			goto error;

		ip_addr = (const char *)buf;

		ip_addr = (const char *)buf;

	}

	}

	strlcpy(clp->cl_ipaddr, ip_addr, sizeof(clp->cl_ipaddr));

	strscpy(clp->cl_ipaddr, ip_addr, sizeof(clp->cl_ipaddr));





	err = nfs_idmap_new(clp);

	err = nfs_idmap_new(clp);

	if (err < 0) {

	if (err < 0) {

fs/nfs/nfsroot.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -139,7 +139,7 @@ static int __init nfs_root_setup(char *line) 
	ROOT_DEV = Root_NFS;

	ROOT_DEV = Root_NFS;





	if (line[0] == '/' || line[0] == ',' || (line[0] >= '0' && line[0] <= '9')) {

	if (line[0] == '/' || line[0] == ',' || (line[0] >= '0' && line[0] <= '9')) {

		strlcpy(nfs_root_parms, line, sizeof(nfs_root_parms));

		strscpy(nfs_root_parms, line, sizeof(nfs_root_parms));

	} else {

	} else {

		size_t n = strlen(line) + sizeof(NFS_ROOT) - 1;

		size_t n = strlen(line) + sizeof(NFS_ROOT) - 1;

		if (n >= sizeof(nfs_root_parms))

		if (n >= sizeof(nfs_root_parms))