NFSv4: Fix a memory leak in nfs4_discover_server_trunking

When we assign a new rpc_client to clp->cl_rpcclient, we need to destroy the old one. Signed-off-by: Trond Myklebust <[email protected]> Cc: Chuck Lever <[email protected]> Cc: [email protected] [>=3.7]
rtvt123 · Apr 5, 2013 · b193d59 · b193d59
1 parent a58e0be
commit b193d59
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
@@ -1886,7 +1886,13 @@ int nfs4_discover_server_trunking(struct nfs_client *clp,
 			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: