UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

nfsd: Protect nfsd4_destroy_clientid using client_lock 

...instead of relying on the client_mutex.

Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
Trond Myklebust 2014-07-30 08:27:08 -04:00 committed by J. Bruce Fields
parent d20c11d86d
commit 6b10ad193d
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/nfsd/nfs4state.c
View File

@ -2826,22 +2826,23 @@ nfsd4_sequence_done(struct nfsd4_compoundres *resp)
__be32 __be32
nfsd4_destroy_clientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, struct nfsd4_destroy_clientid *dc) nfsd4_destroy_clientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, struct nfsd4_destroy_clientid *dc)
{ {
struct nfs4_client *conf, *unconf, *clp; struct nfs4_client *conf, *unconf;
struct nfs4_client *clp = NULL;
__be32 status = 0; __be32 status = 0;
struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id); struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id);
nfs4_lock_state(); nfs4_lock_state();
spin_lock(&nn->client_lock);
unconf = find_unconfirmed_client(&dc->clientid, true, nn); unconf = find_unconfirmed_client(&dc->clientid, true, nn);
conf = find_confirmed_client(&dc->clientid, true, nn); conf = find_confirmed_client(&dc->clientid, true, nn);
WARN_ON_ONCE(conf && unconf); WARN_ON_ONCE(conf && unconf);
if (conf) { if (conf) {
clp = conf;
if (client_has_state(conf)) { if (client_has_state(conf)) {
status = nfserr_clientid_busy; status = nfserr_clientid_busy;
goto out; goto out;
} }
clp = conf;
} else if (unconf) } else if (unconf)
clp = unconf; clp = unconf;
else { else {
@ -2849,12 +2850,16 @@ nfsd4_destroy_clientid(struct svc_rqst *rqstp, struct nfsd4_compound_state *csta
goto out; goto out;
} }
if (!mach_creds_match(clp, rqstp)) { if (!mach_creds_match(clp, rqstp)) {
clp = NULL;
status = nfserr_wrong_cred; status = nfserr_wrong_cred;
goto out; goto out;
} }
expire_client(clp); unhash_client_locked(clp);
out: out:
spin_unlock(&nn->client_lock);
nfs4_unlock_state(); nfs4_unlock_state();
if (clp)
expire_client(clp);
return status; return status;
} }