leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nfs: Fix a memory leak when meeting an unsupported state protect

Browse Source 
Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
This commit is contained in:
Kinglong Mee 2015-07-01 11:54:53 +08:00 committed by Trond Myklebust
parent db2efec0ca
commit 6b55970b0f
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fs/nfs/nfs4proc.c
View File

@ -6972,7 +6972,7 @@ static int _nfs4_proc_exchange_id(struct nfs_client *clp, struct rpc_cred *cred,
/* unsupported! */ /* unsupported! */
WARN_ON_ONCE(1); WARN_ON_ONCE(1);
status = -EINVAL; status = -EINVAL;
goto out_server_scope; goto out_impl_id;
} }
status = rpc_call_sync(clp->cl_rpcclient, &msg, RPC_TASK_TIMEOUT); status = rpc_call_sync(clp->cl_rpcclient, &msg, RPC_TASK_TIMEOUT);
@ -7000,6 +7000,7 @@ static int _nfs4_proc_exchange_id(struct nfs_client *clp, struct rpc_cred *cred,
/* use the most recent implementation id */ /* use the most recent implementation id */
kfree(clp->cl_implid); kfree(clp->cl_implid);
clp->cl_implid = res.impl_id; clp->cl_implid = res.impl_id;
res.impl_id = NULL;
if (clp->cl_serverscope != NULL && if (clp->cl_serverscope != NULL &&
!nfs41_same_server_scope(clp->cl_serverscope, !nfs41_same_server_scope(clp->cl_serverscope,
@ -7013,15 +7014,16 @@ static int _nfs4_proc_exchange_id(struct nfs_client *clp, struct rpc_cred *cred,
if (clp->cl_serverscope == NULL) { if (clp->cl_serverscope == NULL) {
clp->cl_serverscope = res.server_scope; clp->cl_serverscope = res.server_scope;
goto out; res.server_scope = NULL;
} }
} else }
kfree(res.impl_id);
out_server_owner: out_impl_id:
kfree(res.server_owner); kfree(res.impl_id);
out_server_scope: out_server_scope:
kfree(res.server_scope); kfree(res.server_scope);
out_server_owner:
kfree(res.server_owner);
out: out:
if (clp->cl_implid != NULL) if (clp->cl_implid != NULL)
dprintk("NFS reply exchange_id: Server Implementation ID: " dprintk("NFS reply exchange_id: Server Implementation ID: "