Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b10ad19 authored by Trond Myklebust's avatar Trond Myklebust Committed by J. Bruce Fields
Browse files

nfsd: Protect nfsd4_destroy_clientid using client_lock 



...instead of relying on the client_mutex.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent d20c11d8

fs/nfsd/nfs4state.c

+9 −4
Original line number Original line Diff line number Diff line
@@ -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;

}

}