Commit 0c116cad authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4.1: nfs41_clear_delegation_stateid shouldn't trust NFS_DELEGATED_STATE 

This patch removes the assumption made previously, that we only need to
check the delegation stateid when it matches the stateid on a cached
open.

If we believe that we hold a delegation for this file, then we must assume
that its stateid may have been revoked or expired too. If we don't test it
then our state recovery process may end up caching open/lock state in a
situation where it should not.
We therefore rename the function nfs41_clear_delegation_stateid as
nfs41_check_delegation_stateid, and change it to always run through the
delegation stateid test and recovery process as outlined in RFC5661.

http://lkml.kernel.org/r/CAN-5tyHwG=Cn2Q9KsHWadewjpTTy_K26ee+UnSvHvG4192p-Xw@mail.gmail.com


Cc: stable@vger.kernel.org
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent 4dfd4f7a

fs/nfs/nfs4proc.c

+17 −25
Original line number Diff line number Diff line
@@ -2132,44 +2132,36 @@ static int nfs40_open_expired(struct nfs4_state_owner *sp, struct nfs4_state *st 
}



#if defined(CONFIG_NFS_V4_1)

static void nfs41_clear_delegation_stateid(struct nfs4_state *state)

static void nfs41_check_delegation_stateid(struct nfs4_state *state)

{

	struct nfs_server *server = NFS_SERVER(state->inode);

	nfs4_stateid *stateid = &state->stateid;

	nfs4_stateid stateid;

	struct nfs_delegation *delegation;

	struct rpc_cred *cred = NULL;

	int status = -NFS4ERR_BAD_STATEID;



	/* If a state reset has been done, test_stateid is unneeded */

	if (test_bit(NFS_DELEGATED_STATE, &state->flags) == 0)

		return;

	struct rpc_cred *cred;

	int status;



	/* Get the delegation credential for use by test/free_stateid */

	rcu_read_lock();

	delegation = rcu_dereference(NFS_I(state->inode)->delegation);

	if (delegation != NULL &&

	    nfs4_stateid_match(&delegation->stateid, stateid)) {

	if (delegation == NULL) {

		rcu_read_unlock();

		return;

	}



	nfs4_stateid_copy(&stateid, &delegation->stateid);

	cred = get_rpccred(delegation->cred);

	rcu_read_unlock();

		status = nfs41_test_stateid(server, stateid, cred);

	status = nfs41_test_stateid(server, &stateid, cred);

	trace_nfs4_test_delegation_stateid(state, NULL, status);

	} else

		rcu_read_unlock();



	if (status != NFS_OK) {

		/* Free the stateid unless the server explicitly

		 * informs us the stateid is unrecognized. */

		if (status != -NFS4ERR_BAD_STATEID)

			nfs41_free_stateid(server, stateid, cred);

		nfs_remove_bad_delegation(state->inode);



		write_seqlock(&state->seqlock);

		nfs4_stateid_copy(&state->stateid, &state->open_stateid);

		write_sequnlock(&state->seqlock);

		clear_bit(NFS_DELEGATED_STATE, &state->flags);

			nfs41_free_stateid(server, &stateid, cred);

		nfs_finish_clear_delegation_stateid(state);

	}



	if (cred != NULL)

	put_rpccred(cred);

}
@@ -2214,7 +2206,7 @@ static int nfs41_open_expired(struct nfs4_state_owner *sp, struct nfs4_state *st 
{

	int status;



	nfs41_clear_delegation_stateid(state);

	nfs41_check_delegation_stateid(state);

	status = nfs41_check_open_stateid(state);

	if (status != NFS_OK)

		status = nfs4_open_expired(sp, state);

CRA Git | Maintained and supported by SUSTech CRA and CCSE