[PATCH v3 2/5] vfs: deny copy_file_range() for non regular files

Subsystems: filesystems (vfs and infrastructure), the rest

STALE3501d

2 messages, 2 authors, 2017-01-31 · open the first message on its own page

[PATCH v3 2/5] vfs: deny copy_file_range() for non regular files

From: Amir Goldstein <amir73il@gmail.com>
Date: 2017-01-31 08:35:28

There is no in-tree file system that implements copy_file_range()
for non regular files.

Deny an attempt to copy_file_range() a directory with EISDIR
and any other non regualr file with EINVAL to conform with
behavior of vfs_{clone,dedup}_file_range().

This change is needed prior to converting sb_start_write()
to  file_start_write() in the vfs helper.

Cc: linux-api-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: Christoph Hellwig <redacted>
Cc: Al Viro <viro-RmSDqhL/yNMiFSDQTTA3OLVCufUGDwFn@public.gmane.org>
Signed-off-by: Amir Goldstein <redacted>
---
 fs/read_write.c | 5 +++++
 1 file changed, 5 insertions(+)
diff --git a/fs/read_write.c b/fs/read_write.c
index 5816d4c..511178d 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -1518,6 +1518,11 @@ ssize_t vfs_copy_file_range(struct file *file_in, loff_t pos_in,
 	if (flags != 0)
 		return -EINVAL;
 
+	if (S_ISDIR(inode_in->i_mode) || S_ISDIR(inode_out->i_mode))
+		return -EISDIR;
+	if (!S_ISREG(inode_in->i_mode) || !S_ISREG(inode_out->i_mode))
+		return -EINVAL;
+
 	ret = rw_verify_area(READ, file_in, &pos_in, len);
 	if (unlikely(ret))
 		return ret;
-- 
2.7.4

Re: [PATCH v3 2/5] vfs: deny copy_file_range() for non regular files

From: Christoph Hellwig <hch@lst.de>
Date: 2017-01-31 10:56:52

Looks fine,

Reviewed-by: Christoph Hellwig <redacted>
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help