Commit 9271d7e5 authored by Trond Myklebust's avatar Trond Myklebust Committed by J. Bruce Fields
Browse files

nfsd: Ensure we check stateid validity in the seqid operation checks 



After taking the stateid st_mutex, we want to know that the stateid
still represents valid state before performing any non-idempotent
actions.

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

fs/nfsd/nfs4state.c

+3 −9
Original line number Diff line number Diff line
@@ -5234,15 +5234,9 @@ static __be32 nfs4_seqid_op_checks(struct nfsd4_compound_state *cstate, stateid_ 
	status = nfsd4_check_seqid(cstate, sop, seqid);

	if (status)

		return status;

	if (stp->st_stid.sc_type == NFS4_CLOSED_STID

		|| stp->st_stid.sc_type == NFS4_REVOKED_DELEG_STID)

		/*

		 * "Closed" stateid's exist *only* to return

		 * nfserr_replay_me from the previous step, and

		 * revoked delegations are kept only for free_stateid.

		 */

		return nfserr_bad_stateid;

	mutex_lock(&stp->st_mutex);

	status = nfsd4_lock_ol_stateid(stp);

	if (status != nfs_ok)

		return status;

	status = check_stateid_generation(stateid, &stp->st_stid.sc_stateid, nfsd4_has_session(cstate));

	if (status == nfs_ok)

		status = nfs4_check_fh(current_fh, &stp->st_stid);