Commit 40f06c79 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'copy-file-range-fixes-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux 

Pull copy_file_range updates from Darrick Wong:
 "This fixes numerous parameter checking problems and inconsistent
  behaviors in the new(ish) copy_file_range system call.

  Now the system call will actually check its range parameters
  correctly; refuse to copy into files for which the caller does not
  have sufficient privileges; update mtime and strip setuid like file
  writes are supposed to do; and allows copying up to the EOF of the
  source file instead of failing the call like we used to.

  Summary:

   - Create a generic copy_file_range handler and make individual
     filesystems responsible for calling it (i.e. no more assuming that
     do_splice_direct will work or is appropriate)

   - Refactor copy_file_range and remap_range parameter checking where
     they are the same

   - Install missing copy_file_range parameter checking(!)

   - Remove suid/sgid and update mtime like any other file write

   - Change the behavior so that a copy range crossing the source file's
     eof will result in a short copy to the source file's eof instead of
     EINVAL

   - Permit filesystems to decide if they want to handle
     cross-superblock copy_file_range in their local handlers"

* tag 'copy-file-range-fixes-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  fuse: copy_file_range needs to strip setuid bits and update timestamps
  vfs: allow copy_file_range to copy across devices
  xfs: use file_modified() helper
  vfs: introduce file_modified() helper
  vfs: add missing checks to copy_file_range
  vfs: remove redundant checks from generic_remap_checks()
  vfs: introduce generic_file_rw_checks()
  vfs: no fallback for ->copy_file_range
  vfs: introduce generic_copy_file_range()
parents a47f5c56 fe0da9c0

fs/ceph/file.c

+20 −3
Original line number Diff line number Diff line
@@ -1889,7 +1889,7 @@ static int is_file_size_ok(struct inode *src_inode, struct inode *dst_inode, 
	return 0;

}



static ssize_t ceph_copy_file_range(struct file *src_file, loff_t src_off,

static ssize_t __ceph_copy_file_range(struct file *src_file, loff_t src_off,

				      struct file *dst_file, loff_t dst_off,

				      size_t len, unsigned int flags)

{
@@ -1909,6 +1909,8 @@ static ssize_t ceph_copy_file_range(struct file *src_file, loff_t src_off, 


	if (src_inode == dst_inode)

		return -EINVAL;

	if (src_inode->i_sb != dst_inode->i_sb)

		return -EXDEV;

	if (ceph_snap(dst_inode) != CEPH_NOSNAP)

		return -EROFS;
@@ -2100,6 +2102,21 @@ out: 
	return ret;

}



static ssize_t ceph_copy_file_range(struct file *src_file, loff_t src_off,

				    struct file *dst_file, loff_t dst_off,

				    size_t len, unsigned int flags)

{

	ssize_t ret;



	ret = __ceph_copy_file_range(src_file, src_off, dst_file, dst_off,

				     len, flags);



	if (ret == -EOPNOTSUPP || ret == -EXDEV)

		ret = generic_copy_file_range(src_file, src_off, dst_file,

					      dst_off, len, flags);

	return ret;

}



const struct file_operations ceph_file_fops = {

	.open = ceph_open,

	.release = ceph_release,

fs/cifs/cifsfs.c

+4 −0
Original line number Diff line number Diff line
@@ -1149,6 +1149,10 @@ static ssize_t cifs_copy_file_range(struct file *src_file, loff_t off, 
	rc = cifs_file_copychunk_range(xid, src_file, off, dst_file, destoff,

					len, flags);

	free_xid(xid);



	if (rc == -EOPNOTSUPP || rc == -EXDEV)

		rc = generic_copy_file_range(src_file, off, dst_file,

					     destoff, len, flags);

	return rc;

}

fs/fuse/file.c

+26 −3
Original line number Diff line number Diff line
@@ -3112,7 +3112,7 @@ out: 
	return err;

}



static ssize_t fuse_copy_file_range(struct file *file_in, loff_t pos_in,

static ssize_t __fuse_copy_file_range(struct file *file_in, loff_t pos_in,

				      struct file *file_out, loff_t pos_out,

				      size_t len, unsigned int flags)

{
@@ -3142,6 +3142,9 @@ static ssize_t fuse_copy_file_range(struct file *file_in, loff_t pos_in, 
	if (fc->no_copy_file_range)

		return -EOPNOTSUPP;



	if (file_inode(file_in)->i_sb != file_inode(file_out)->i_sb)

		return -EXDEV;



	if (fc->writeback_cache) {

		inode_lock(inode_in);

		err = fuse_writeback_range(inode_in, pos_in, pos_in + len);
@@ -3152,6 +3155,10 @@ static ssize_t fuse_copy_file_range(struct file *file_in, loff_t pos_in, 


	inode_lock(inode_out);



	err = file_modified(file_out);

	if (err)

		goto out;



	if (fc->writeback_cache) {

		err = fuse_writeback_range(inode_out, pos_out, pos_out + len);

		if (err)
@@ -3190,10 +3197,26 @@ out: 
		clear_bit(FUSE_I_SIZE_UNSTABLE, &fi_out->state);



	inode_unlock(inode_out);

	file_accessed(file_in);



	return err;

}



static ssize_t fuse_copy_file_range(struct file *src_file, loff_t src_off,

				    struct file *dst_file, loff_t dst_off,

				    size_t len, unsigned int flags)

{

	ssize_t ret;



	ret = __fuse_copy_file_range(src_file, src_off, dst_file, dst_off,

				     len, flags);



	if (ret == -EOPNOTSUPP || ret == -EXDEV)

		ret = generic_copy_file_range(src_file, src_off, dst_file,

					      dst_off, len, flags);

	return ret;

}



static const struct file_operations fuse_file_operations = {

	.llseek		= fuse_file_llseek,

	.read_iter	= fuse_file_read_iter,

fs/inode.c

+20 −0
Original line number Diff line number Diff line
@@ -1899,6 +1899,26 @@ int file_update_time(struct file *file) 
}

EXPORT_SYMBOL(file_update_time);



/* Caller must hold the file's inode lock */

int file_modified(struct file *file)

{

	int err;



	/*

	 * Clear the security bits if the process is not being run by root.

	 * This keeps people from modifying setuid and setgid binaries.

	 */

	err = file_remove_privs(file);

	if (err)

		return err;



	if (unlikely(file->f_mode & FMODE_NOCMTIME))

		return 0;



	return file_update_time(file);

}

EXPORT_SYMBOL(file_modified);



int inode_needs_sync(struct inode *inode)

{

	if (IS_SYNC(inode))

fs/nfs/nfs4file.c

+20 −3
Original line number Diff line number Diff line
@@ -129,10 +129,13 @@ nfs4_file_flush(struct file *file, fl_owner_t id) 
}



#ifdef CONFIG_NFS_V4_2

static ssize_t nfs4_copy_file_range(struct file *file_in, loff_t pos_in,

static ssize_t __nfs4_copy_file_range(struct file *file_in, loff_t pos_in,

				      struct file *file_out, loff_t pos_out,

				      size_t count, unsigned int flags)

{

	/* Only offload copy if superblock is the same */

	if (file_inode(file_in)->i_sb != file_inode(file_out)->i_sb)

		return -EXDEV;

	if (!nfs_server_capable(file_inode(file_out), NFS_CAP_COPY))

		return -EOPNOTSUPP;

	if (file_inode(file_in) == file_inode(file_out))
@@ -140,6 +143,20 @@ static ssize_t nfs4_copy_file_range(struct file *file_in, loff_t pos_in, 
	return nfs42_proc_copy(file_in, pos_in, file_out, pos_out, count);

}



static ssize_t nfs4_copy_file_range(struct file *file_in, loff_t pos_in,

				    struct file *file_out, loff_t pos_out,

				    size_t count, unsigned int flags)

{

	ssize_t ret;



	ret = __nfs4_copy_file_range(file_in, pos_in, file_out, pos_out, count,

				     flags);

	if (ret == -EOPNOTSUPP || ret == -EXDEV)

		ret = generic_copy_file_range(file_in, pos_in, file_out,

					      pos_out, count, flags);

	return ret;

}



static loff_t nfs4_file_llseek(struct file *filep, loff_t offset, int whence)

{

	loff_t ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE