SUNRPC: Replace strlcpy() with strscpy()

[linux-2.6-microblaze.git] / net / sunrpc / clnt.c

diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c
index daa9582..7afe02b 100644 (file)
--- a/net/sunrpc/clnt.c
+++ b/net/sunrpc/clnt.c
@@ -287,8 +287,14 @@ static struct rpc_xprt *rpc_clnt_set_transport(struct rpc_clnt *clnt,
 
 static void rpc_clnt_set_nodename(struct rpc_clnt *clnt, const char *nodename)
 {
-       clnt->cl_nodelen = strlcpy(clnt->cl_nodename,
-                       nodename, sizeof(clnt->cl_nodename));
+       ssize_t copied;
+
+       copied = strscpy(clnt->cl_nodename,
+                        nodename, sizeof(clnt->cl_nodename));
+
+       clnt->cl_nodelen = copied < 0
+                               ? sizeof(clnt->cl_nodename) - 1
+                               : copied;
 }
 
 static int rpc_client_register(struct rpc_clnt *clnt,