Commit 06b8d255 authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files

SUNRPC: Make sure server name is reasonable before trying to print it 



Check the length of the passed-in server name before trying to print it in
the log.

Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 6d0aa06a

net/sunrpc/clnt.c

+8 −2
Original line number Diff line number Diff line
@@ -127,7 +127,14 @@ static struct rpc_clnt * rpc_new_client(struct rpc_xprt *xprt, char *servname, s 
	struct rpc_clnt		*clnt = NULL;

	struct rpc_auth		*auth;

	int err;

	int len;

	size_t len;



	/* sanity check the name before trying to print it */

	err = -EINVAL;

	len = strlen(servname);

	if (len > RPC_MAXNETNAMELEN)

		goto out_no_rpciod;

	len++;



	dprintk("RPC:       creating %s client for %s (xprt %p)\n",

			program->name, servname, xprt);
@@ -148,7 +155,6 @@ static struct rpc_clnt * rpc_new_client(struct rpc_xprt *xprt, char *servname, s 
	clnt->cl_parent = clnt;



	clnt->cl_server = clnt->cl_inline_name;

	len = strlen(servname) + 1;

	if (len > sizeof(clnt->cl_inline_name)) {

		char *buf = kmalloc(len, GFP_KERNEL);

		if (buf != 0)