Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 010bd965 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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

Miklos writes:
  "overlayfs fixes for 4.19-rc7

   This update fixes a couple of regressions in the stacked file update
   added in this cycle, as well as some older bugs uncovered by
   syzkaller.

   There's also one trivial naming change that touches other parts of
   the fs subsystem."

* tag 'ovl-fixes-4.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs:
  ovl: fix format of setxattr debug
  ovl: fix access beyond unterminated strings
  ovl: make symbol 'ovl_aops' static
  vfs: swap names of {do,vfs}_clone_file_range()
  ovl: fix freeze protection bypass in ovl_clone_file_range()
  ovl: fix freeze protection bypass in ovl_write_iter()
  ovl: fix memory leak on unlink of indexed file
parents ac0657ed 1a8f8d2a

fs/ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ static long ioctl_file_clone(struct file *dst_file, unsigned long srcfd, 
	ret = -EXDEV;

	if (src_file.file->f_path.mnt != dst_file->f_path.mnt)

		goto fdput;

	ret = do_clone_file_range(src_file.file, off, dst_file, destoff, olen);

	ret = vfs_clone_file_range(src_file.file, off, dst_file, destoff, olen);

fdput:

	fdput(src_file);

	return ret;

fs/nfsd/vfs.c

+2 −1
Original line number Diff line number Diff line
@@ -541,7 +541,8 @@ __be32 nfsd4_set_nfs4_label(struct svc_rqst *rqstp, struct svc_fh *fhp, 
__be32 nfsd4_clone_file_range(struct file *src, u64 src_pos, struct file *dst,

		u64 dst_pos, u64 count)

{

	return nfserrno(do_clone_file_range(src, src_pos, dst, dst_pos, count));

	return nfserrno(vfs_clone_file_range(src, src_pos, dst, dst_pos,

					     count));

}



ssize_t nfsd_copy_file_range(struct file *src, u64 src_pos, struct file *dst,

fs/overlayfs/copy_up.c

+1 −1
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ static int ovl_copy_up_data(struct path *old, struct path *new, loff_t len) 
	}



	/* Try to use clone_file_range to clone up within the same fs */

	error = vfs_clone_file_range(old_file, 0, new_file, 0, len);

	error = do_clone_file_range(old_file, 0, new_file, 0, len);

	if (!error)

		goto out;

	/* Couldn't clone, so now we try to copy the data */

fs/overlayfs/file.c

+2 −0
Original line number Diff line number Diff line
@@ -240,8 +240,10 @@ static ssize_t ovl_write_iter(struct kiocb *iocb, struct iov_iter *iter) 
		goto out_unlock;



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

	file_start_write(real.file);

	ret = vfs_iter_write(real.file, iter, &iocb->ki_pos,

			     ovl_iocb_to_rwf(iocb));

	file_end_write(real.file);

	revert_creds(old_cred);



	/* Update size */

fs/overlayfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ static const struct inode_operations ovl_special_inode_operations = { 
	.update_time	= ovl_update_time,

};



const struct address_space_operations ovl_aops = {

static const struct address_space_operations ovl_aops = {

	/* For O_DIRECT dentry_open() checks f_mapping->a_ops->direct_IO */

	.direct_IO		= noop_direct_IO,

};