diff options
| author | Andrew Elble <aweits@rit.edu> | 2018-10-05 09:32:08 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2018-10-29 16:58:04 -0400 |
| commit | bd8d725078867cda250fe94b9c5a067b4a64ca74 (patch) | |
| tree | 4c0f4fa0b06e38c6cbd8ad04f25aa5d5d453daaf | |
| parent | 3ae2cefb613b00d613677c05ffa384b4f660f468 (diff) | |
| download | linux-stable-bd8d725078867cda250fe94b9c5a067b4a64ca74.tar.gz linux-stable-bd8d725078867cda250fe94b9c5a067b4a64ca74.tar.bz2 linux-stable-bd8d725078867cda250fe94b9c5a067b4a64ca74.zip | |
nfsd: correctly decrement odstate refcount in error path
alloc_init_deleg() both allocates an nfs4_delegation, and
bumps the refcount on odstate. So after this point, we need to
put_clnt_odstate() and nfs4_put_stid() to not leave the odstate
refcount inappropriately bumped.
Signed-off-by: Andrew Elble <aweits@rit.edu>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Cc: stable@vger.kernel.org
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
| -rw-r--r-- | fs/nfsd/nfs4state.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 07a57d024f95..f093fbe47133 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -4398,7 +4398,7 @@ nfs4_set_delegation(struct nfs4_client *clp, struct svc_fh *fh, fl = nfs4_alloc_init_lease(dp, NFS4_OPEN_DELEGATE_READ); if (!fl) - goto out_stid; + goto out_clnt_odstate; status = vfs_setlease(fp->fi_deleg_file, fl->fl_type, &fl, NULL); if (fl) @@ -4423,7 +4423,6 @@ out_unlock: vfs_setlease(fp->fi_deleg_file, F_UNLCK, NULL, (void **)&dp); out_clnt_odstate: put_clnt_odstate(dp->dl_clnt_odstate); -out_stid: nfs4_put_stid(&dp->dl_stid); out_delegees: put_deleg_file(fp); |