Commit 1aee9158 authored by Al Viro's avatar Al Viro
Browse files

nfsd: lock_rename() needs both directories to live on the same fs 



... checking that after lock_rename() is too late.  Incidentally,
NFSv2 had no nfserr_xdev...

Fixes: aa387d6c "nfsd: fix EXDEV checking in rename"
Cc: stable@vger.kernel.org # v3.9+
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Acked-by: default avatarChuck Lever <chuck.lever@oracle.com>
Tested-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 94f6f055

fs/nfsd/vfs.c

+6 −6
Original line number Diff line number Diff line
@@ -1788,6 +1788,12 @@ nfsd_rename(struct svc_rqst *rqstp, struct svc_fh *ffhp, char *fname, int flen, 
	if (!flen || isdotent(fname, flen) || !tlen || isdotent(tname, tlen))

		goto out;



	err = (rqstp->rq_vers == 2) ? nfserr_acces : nfserr_xdev;

	if (ffhp->fh_export->ex_path.mnt != tfhp->fh_export->ex_path.mnt)

		goto out;

	if (ffhp->fh_export->ex_path.dentry != tfhp->fh_export->ex_path.dentry)

		goto out;



retry:

	host_err = fh_want_write(ffhp);

	if (host_err) {
@@ -1823,12 +1829,6 @@ nfsd_rename(struct svc_rqst *rqstp, struct svc_fh *ffhp, char *fname, int flen, 
	if (ndentry == trap)

		goto out_dput_new;



	host_err = -EXDEV;

	if (ffhp->fh_export->ex_path.mnt != tfhp->fh_export->ex_path.mnt)

		goto out_dput_new;

	if (ffhp->fh_export->ex_path.dentry != tfhp->fh_export->ex_path.dentry)

		goto out_dput_new;



	if ((ndentry->d_sb->s_export_op->flags & EXPORT_OP_CLOSE_BEFORE_UNLINK) &&

	    nfsd_has_cached_files(ndentry)) {

		close_cached = true;