Commit bd8d7250 authored Oct 05, 2018 by Andrew Elble Committed by J. Bruce Fields Oct 29, 2018

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>

parent 3ae2cefb

fs/nfsd/nfs4state.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -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);

Admin message