* [PATCH] vfs: Don't copy beyond the end of the file
@ 2016-09-07 20:10 Anna Schumaker
0 siblings, 0 replies; only message in thread
From: Anna Schumaker @ 2016-09-07 20:10 UTC (permalink / raw)
To: linux-fsdevel, linux-nfs, viro
According to `man 2 copy_file_range`, EINVAL should be returned if the
"requested range extends beyond the end of the source file". Falling
back on do_splice_direct() will return 0 in this case, so let's add an
explicit check to match the behavior documented in the man page.
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
---
fs/read_write.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/fs/read_write.c b/fs/read_write.c
index 66215a7..1cbab4e 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -1497,6 +1497,9 @@ ssize_t vfs_copy_file_range(struct file *file_in, loff_t pos_in,
if (unlikely(ret))
return ret;
+ if (pos_in >= i_size_read(inode_in))
+ return -EINVAL;
+
if (!(file_in->f_mode & FMODE_READ) ||
!(file_out->f_mode & FMODE_WRITE) ||
(file_out->f_flags & O_APPEND))
--
2.9.3
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2016-09-07 20:10 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-07 20:10 [PATCH] vfs: Don't copy beyond the end of the file Anna Schumaker
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).