hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nfsd: unlock on error in manage_cpntf_state() 

We are holding the "nn->s2s_cp_lock" so we can't return directly
without unlocking first.

Fixes: f3dee17721a0 ("NFSD check stateids against copy stateids")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
This commit is contained in:
Dan Carpenter 2019-12-04 10:59:36 +03:00 committed by J. Bruce Fields
parent ce0887ac96
commit 5277a79e2d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fs/nfsd/nfs4state.c
View File

@ -5695,13 +5695,16 @@ __be32 manage_cpntf_state(struct nfsd_net *nn, stateid_t *st,
if (cps_t) { if (cps_t) {
state = container_of(cps_t, struct nfs4_cpntf_state, state = container_of(cps_t, struct nfs4_cpntf_state,
cp_stateid); cp_stateid);
if (state->cp_stateid.sc_type != NFS4_COPYNOTIFY_STID) if (state->cp_stateid.sc_type != NFS4_COPYNOTIFY_STID) {
return nfserr_bad_stateid; state = NULL;
goto unlock;
}
if (!clp) if (!clp)
refcount_inc(&state->cp_stateid.sc_count); refcount_inc(&state->cp_stateid.sc_count);
else else
_free_cpntf_state_locked(nn, state); _free_cpntf_state_locked(nn, state);
} }
unlock:
spin_unlock(&nn->s2s_cp_lock); spin_unlock(&nn->s2s_cp_lock);
if (!state) if (!state)
return nfserr_bad_stateid; return nfserr_bad_stateid;