Commit b60be028 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ovl-fixes-5.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs 

Pull overlayfs fixes from Miklos Szeredi:
 "Fix two bugs, both of them corner cases not affecting most users"

* tag 'ovl-fixes-5.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs:
  ovl: fix IOCB_DIRECT if underlying fs doesn't support direct IO
  ovl: fix missing negative dentry check in ovl_rename()
parents df5c1883 1dc1eed4

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)

fs/overlayfs/file.c

+14 −1
Original line number Diff line number Diff line
@@ -296,6 +296,12 @@ static ssize_t ovl_read_iter(struct kiocb *iocb, struct iov_iter *iter) 
	if (ret)

		return ret;



	ret = -EINVAL;

	if (iocb->ki_flags & IOCB_DIRECT &&

	    (!real.file->f_mapping->a_ops ||

	     !real.file->f_mapping->a_ops->direct_IO))

		goto out_fdput;



	old_cred = ovl_override_creds(file_inode(file)->i_sb);

	if (is_sync_kiocb(iocb)) {

		ret = vfs_iter_read(real.file, iter, &iocb->ki_pos,
@@ -320,7 +326,7 @@ static ssize_t ovl_read_iter(struct kiocb *iocb, struct iov_iter *iter) 
out:

	revert_creds(old_cred);

	ovl_file_accessed(file);



out_fdput:

	fdput(real);



	return ret;
@@ -349,6 +355,12 @@ static ssize_t ovl_write_iter(struct kiocb *iocb, struct iov_iter *iter) 
	if (ret)

		goto out_unlock;



	ret = -EINVAL;

	if (iocb->ki_flags & IOCB_DIRECT &&

	    (!real.file->f_mapping->a_ops ||

	     !real.file->f_mapping->a_ops->direct_IO))

		goto out_fdput;



	if (!ovl_should_sync(OVL_FS(inode->i_sb)))

		ifl &= ~(IOCB_DSYNC | IOCB_SYNC);
@@ -384,6 +396,7 @@ static ssize_t ovl_write_iter(struct kiocb *iocb, struct iov_iter *iter) 
	}

out:

	revert_creds(old_cred);

out_fdput:

	fdput(real);



out_unlock: