Commit 4335723e authored by J. Bruce Fields's avatar J. Bruce Fields
Browse files

nfsd4: fix delegation-unlink/rename race 



If a file is unlinked or renamed between the time when we do the local
open and the time when we get the delegation, then we will return to the
client indicating that it holds a delegation even though the file no
longer exists under the name it was open under.

But a client performing an open-by-name, when it is returned a
delegation, must be able to assume that the file is still linked at the
name it was opened under.

So, hold the parent i_mutex for longer to prevent concurrent renames or
unlinks.

Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent c0e6bee4

fs/nfsd/nfs4proc.c

+7 −3
Original line number Diff line number Diff line
@@ -279,11 +279,15 @@ do_open_lookup(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, stru 
		if (open->op_createmode == NFS4_CREATE_EXCLUSIVE && status == 0)

			open->op_bmval[1] = (FATTR4_WORD1_TIME_ACCESS |

							FATTR4_WORD1_TIME_MODIFY);

	} else {

	} else

		/*

		 * Note this may exit with the parent still locked.

		 * We will hold the lock until nfsd4_open's final

		 * lookup, to prevent renames or unlinks until we've had

		 * a chance to an acquire a delegation if appropriate.

		 */

		status = nfsd_lookup(rqstp, current_fh,

				     open->op_fname.data, open->op_fname.len, *resfh);

		fh_unlock(current_fh);

	}

	if (status)

		goto out;

	status = nfsd_check_obj_isreg(*resfh);

fs/nfsd/vfs.c

+6 −1
Original line number Diff line number Diff line
@@ -207,7 +207,12 @@ nfsd_lookup_dentry(struct svc_rqst *rqstp, struct svc_fh *fhp, 
				goto out_nfserr;

		}

	} else {

		fh_lock(fhp);

		/*

		 * In the nfsd4_open() case, this may be held across

		 * subsequent open and delegation acquisition which may

		 * need to take the child's i_mutex:

		 */

		fh_lock_nested(fhp, I_MUTEX_PARENT);

		dentry = lookup_one_len(name, dparent, len);

		host_err = PTR_ERR(dentry);

		if (IS_ERR(dentry))

CRA Git | Maintained and supported by SUSTech CRA and CCSE