diff options
| author | Trond Myklebust <trond.myklebust@primarydata.com> | 2017-11-03 13:00:15 +0100 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2017-11-27 22:45:10 +0100 |
| commit | 9271d7e509c1bfc0b9a418caec29ec8d1ac38270 (patch) | |
| tree | fa80328c8ca89fb78e5a35ad2328566ebb3f14f1 /fs | |
| parent | nfsd: Fix race in lock stateid creation (diff) | |
| download | linux-9271d7e509c1bfc0b9a418caec29ec8d1ac38270.tar.xz linux-9271d7e509c1bfc0b9a418caec29ec8d1ac38270.zip | |
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: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/nfsd/nfs4state.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 6d5993caf9bc..da07c24e9372 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -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); |