Commit 692ad280 authored Apr 18, 2018 by Andrew Elble Committed by J. Bruce Fields Jun 08, 2018

nfsd: fix error handling in nfs4_set_delegation()



I noticed a memory corruption crash in nfsd in
4.17-rc1. This patch corrects the issue.

Fix to return error if the delegation couldn't be hashed or there was
a recall in progress. Use the existing error path instead of
destroy_delegation() for readability.

Signed-off-by: Andrew Elble <aweits@rit.edu>
Fixes: 353601e7 ("nfsd: create a separate lease for each delegation")
Signed-off-by: J. Bruce Fields <bfields@redhat.com>

parent 3171822f

fs/nfsd/nfs4state.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -4378,8 +4378,11 @@ nfs4_set_delegation(struct nfs4_client clp, struct svc_fh fh,
		spin_unlock(&state_lock);

		if (status)
		destroy_unhashed_deleg(dp);
		goto out_unlock;

		return dp;
		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:

Admin message