Commit a295aef6 authored by Zheng Liang's avatar Zheng Liang Committed by Miklos Szeredi
Browse files

ovl: fix missing negative dentry check in ovl_rename() 



The following reproducer

  mkdir lower upper work merge
  touch lower/old
  touch lower/new
  mount -t overlay overlay -olowerdir=lower,upperdir=upper,workdir=work merge
  rm merge/new
  mv merge/old merge/new & unlink upper/new

may result in this race:

PROCESS A:
  rename("merge/old", "merge/new");
  overwrite=true,ovl_lower_positive(old)=true,
  ovl_dentry_is_whiteout(new)=true -> flags |= RENAME_EXCHANGE

PROCESS B:
  unlink("upper/new");

PROCESS A:
  lookup newdentry in new_upperdir
  call vfs_rename() with negative newdentry and RENAME_EXCHANGE

Fix by adding the missing check for negative newdentry.

Signed-off-by: default avatarZheng Liang <zhengliang6@huawei.com>
Fixes: e9be9d5e ("overlay filesystem")
Cc: <stable@vger.kernel.org> # v3.18
Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
parent 6880fa6c

fs/overlayfs/dir.c

+7 −3
Original line number Diff line number Diff line
@@ -1219,9 +1219,13 @@ static int ovl_rename(struct user_namespace *mnt_userns, struct inode *olddir, 
				goto out_dput;

		}

	} else {

		if (!d_is_negative(newdentry) &&

		    (!new_opaque || !ovl_is_whiteout(newdentry)))

		if (!d_is_negative(newdentry)) {

			if (!new_opaque || !ovl_is_whiteout(newdentry))

				goto out_dput;

		} else {

			if (flags & RENAME_EXCHANGE)

				goto out_dput;

		}

	}



	if (olddentry == trap)