projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'device-properties-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-block.git]
/
fs
/
splice.c
diff --git
a/fs/splice.c
b/fs/splice.c
index b018eb485019b1ed1bed2ccdc6c7b9914c575963..dd9bf7e410d2975f212accdf827df8a47c2d4c94 100644
(file)
--- a/
fs/splice.c
+++ b/
fs/splice.c
@@
-1143,6
+1143,9
@@
static long do_splice_to(struct file *in, loff_t *ppos,
if (unlikely(ret < 0))
return ret;
+ if (unlikely(len > MAX_RW_COUNT))
+ len = MAX_RW_COUNT;
+
if (in->f_op->splice_read)
splice_read = in->f_op->splice_read;
else