summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAmir Goldstein <amir73il@gmail.com>2019-06-05 11:04:49 -0400
committerDarrick J. Wong <darrick.wong@oracle.com>2019-06-09 13:06:19 -0400
commit96e6e8f4a68df2d94800311163faa67124df24e5 (patch)
tree42b63675c58ce53f9896daf674937625e71a684d
parent646955cd5425dd8fed8205cbb1b4373c222d028e (diff)
vfs: add missing checks to copy_file_range
Like the clone and dedupe interfaces we've recently fixed, the copy_file_range() implementation is missing basic sanity, limits and boundary condition tests on the parameters that are passed to it from userspace. Create a new "generic_copy_file_checks()" function modelled on the generic_remap_checks() function to provide this missing functionality. [Amir] Shorten copy length instead of checking pos_in limits because input file size already abides by the limits. Signed-off-by: Dave Chinner <dchinner@redhat.com> Signed-off-by: Amir Goldstein <amir73il@gmail.com> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
-rw-r--r--fs/read_write.c3
-rw-r--r--include/linux/fs.h3
-rw-r--r--mm/filemap.c53
3 files changed, 58 insertions, 1 deletions
diff --git a/fs/read_write.c b/fs/read_write.c
index f1900bdb3127..b0fb1176b628 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -1626,7 +1626,8 @@ ssize_t vfs_copy_file_range(struct file *file_in, loff_t pos_in,
1626 if (file_inode(file_in)->i_sb != file_inode(file_out)->i_sb) 1626 if (file_inode(file_in)->i_sb != file_inode(file_out)->i_sb)
1627 return -EXDEV; 1627 return -EXDEV;
1628 1628
1629 ret = generic_file_rw_checks(file_in, file_out); 1629 ret = generic_copy_file_checks(file_in, pos_in, file_out, pos_out, &len,
1630 flags);
1630 if (unlikely(ret)) 1631 if (unlikely(ret))
1631 return ret; 1632 return ret;
1632 1633
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 89b9b73eb581..e4d382c4342a 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -3050,6 +3050,9 @@ extern int generic_remap_checks(struct file *file_in, loff_t pos_in,
3050 struct file *file_out, loff_t pos_out, 3050 struct file *file_out, loff_t pos_out,
3051 loff_t *count, unsigned int remap_flags); 3051 loff_t *count, unsigned int remap_flags);
3052extern int generic_file_rw_checks(struct file *file_in, struct file *file_out); 3052extern int generic_file_rw_checks(struct file *file_in, struct file *file_out);
3053extern int generic_copy_file_checks(struct file *file_in, loff_t pos_in,
3054 struct file *file_out, loff_t pos_out,
3055 size_t *count, unsigned int flags);
3053extern ssize_t generic_file_read_iter(struct kiocb *, struct iov_iter *); 3056extern ssize_t generic_file_read_iter(struct kiocb *, struct iov_iter *);
3054extern ssize_t __generic_file_write_iter(struct kiocb *, struct iov_iter *); 3057extern ssize_t __generic_file_write_iter(struct kiocb *, struct iov_iter *);
3055extern ssize_t generic_file_write_iter(struct kiocb *, struct iov_iter *); 3058extern ssize_t generic_file_write_iter(struct kiocb *, struct iov_iter *);
diff --git a/mm/filemap.c b/mm/filemap.c
index 44361928bbb0..aac71aef4c61 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -3056,6 +3056,59 @@ int generic_file_rw_checks(struct file *file_in, struct file *file_out)
3056 return 0; 3056 return 0;
3057} 3057}
3058 3058
3059/*
3060 * Performs necessary checks before doing a file copy
3061 *
3062 * Can adjust amount of bytes to copy via @req_count argument.
3063 * Returns appropriate error code that caller should return or
3064 * zero in case the copy should be allowed.
3065 */
3066int generic_copy_file_checks(struct file *file_in, loff_t pos_in,
3067 struct file *file_out, loff_t pos_out,
3068 size_t *req_count, unsigned int flags)
3069{
3070 struct inode *inode_in = file_inode(file_in);
3071 struct inode *inode_out = file_inode(file_out);
3072 uint64_t count = *req_count;
3073 loff_t size_in;
3074 int ret;
3075
3076 ret = generic_file_rw_checks(file_in, file_out);
3077 if (ret)
3078 return ret;
3079
3080 /* Don't touch certain kinds of inodes */
3081 if (IS_IMMUTABLE(inode_out))
3082 return -EPERM;
3083
3084 if (IS_SWAPFILE(inode_in) || IS_SWAPFILE(inode_out))
3085 return -ETXTBSY;
3086
3087 /* Ensure offsets don't wrap. */
3088 if (pos_in + count < pos_in || pos_out + count < pos_out)
3089 return -EOVERFLOW;
3090
3091 /* Shorten the copy to EOF */
3092 size_in = i_size_read(inode_in);
3093 if (pos_in >= size_in)
3094 count = 0;
3095 else
3096 count = min(count, size_in - (uint64_t)pos_in);
3097
3098 ret = generic_write_check_limits(file_out, pos_out, &count);
3099 if (ret)
3100 return ret;
3101
3102 /* Don't allow overlapped copying within the same file. */
3103 if (inode_in == inode_out &&
3104 pos_out + count > pos_in &&
3105 pos_out < pos_in + count)
3106 return -EINVAL;
3107
3108 *req_count = count;
3109 return 0;
3110}
3111
3059int pagecache_write_begin(struct file *file, struct address_space *mapping, 3112int pagecache_write_begin(struct file *file, struct address_space *mapping,
3060 loff_t pos, unsigned len, unsigned flags, 3113 loff_t pos, unsigned len, unsigned flags,
3061 struct page **pagep, void **fsdata) 3114 struct page **pagep, void **fsdata)