From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Thu, 4 Apr 2013 19:55:00 +0000 (-0400)
Subject: NFSv4: Fix a memory leak in nfs4_discover_server_trunking
X-Git-Tag: v3.8.7~19
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c80a1c58deeac0c21cbf8d952c1bd08f1afbe8ed;p=users%2Fjedix%2Flinux-maple.git

NFSv4: Fix a memory leak in nfs4_discover_server_trunking

commit b193d59a4863ea670872d76dc99231ddeb598625 upstream.

When we assign a new rpc_client to clp->cl_rpcclient, we need to destroy
the old one.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
index e61f68d5ef218..994fbe2c714ca 100644
--- a/fs/nfs/nfs4state.c
+++ b/fs/nfs/nfs4state.c
@@ -1877,7 +1877,13 @@ again:
 			status = PTR_ERR(clnt);
 			break;
 		}
-		clp->cl_rpcclient = clnt;
+		/* Note: this is safe because we haven't yet marked the
+		 * client as ready, so we are the only user of
+		 * clp->cl_rpcclient
+		 */
+		clnt = xchg(&clp->cl_rpcclient, clnt);
+		rpc_shutdown_client(clnt);
+		clnt = clp->cl_rpcclient;
 		goto again;
 
 	case -NFS4ERR_MINOR_VERS_MISMATCH: