diff --git a/[refs] b/[refs]
index 936b1bdefaee..fd6bd4815656 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bcd2ea17da6a329a7276cde7286d802f009af332
+refs/heads/master: f4373bf9e67e4a653c8854acd7b02dac9714c98a
diff --git a/trunk/fs/nfs/client.c b/trunk/fs/nfs/client.c
index 63976c0ccc25..99ea196f071f 100644
--- a/trunk/fs/nfs/client.c
+++ b/trunk/fs/nfs/client.c
@@ -1180,7 +1180,7 @@ static int nfs4_init_client(struct nfs_client *clp,
 				      1, flags & NFS_MOUNT_NORESVPORT);
 	if (error < 0)
 		goto error;
-	memcpy(clp->cl_ipaddr, ip_addr, sizeof(clp->cl_ipaddr));
+	strlcpy(clp->cl_ipaddr, ip_addr, sizeof(clp->cl_ipaddr));
 
 	error = nfs_idmap_new(clp);
 	if (error < 0) {