Re: [PATCH] SUNRPC: fix a memory leak for tcp NFSv4.1 backchannel

["J. Bruce Fields" <bfields@fieldses.org>]

On Mon, Jan 06, 2014 at 05:33:22PM +0800, Kinglong Mee wrote:
> xs_setup_bc_tcp may return an existing xprt with non-NULL servername.
> xprt_create_transport should not kstrdup servername for it.
> Otherwise, those memory for servername will be leaked.

OK.  Applying to my tree if Trond has no objection.

--b.

> 
> Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
> ---
>  net/sunrpc/xprt.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
> index ddd198e..6fa966f 100644
> --- a/net/sunrpc/xprt.c
> +++ b/net/sunrpc/xprt.c
> @@ -1339,7 +1339,11 @@ found:
>  		xprt_destroy(xprt);
>  		return ERR_PTR(-EINVAL);
>  	}
> -	xprt->servername = kstrdup(args->servername, GFP_KERNEL);
> +
> +	/* servername may not be NULL for tcp NFSv4.1 backchannel */
> +	if (xprt->servername == NULL)
> +		xprt->servername = kstrdup(args->servername, GFP_KERNEL);
> +
>  	if (xprt->servername == NULL) {
>  		xprt_destroy(xprt);
>  		return ERR_PTR(-ENOMEM);
> -- 
> 1.8.4.2