diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2015-01-29 02:50:33 +0000 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-03-12 17:31:27 +0100 |
| commit | d7e3ae47c441894b11dce376ff8d110780872d0d (patch) | |
| tree | 77c388e5d6da42f2899f3439cb7e89a7d0d5eccf /fs/splice.c | |
| parent | 43bf73e12b705c424066670eda35a5677ae72a13 (diff) | |
splice: Apply generic position and size checks to each write
We need to check the position and size of file writes against various
limits, using generic_write_check(). This was not being done for
the splice write path. It was fixed upstream by commit 8d0207652cbe
("->splice_write() via ->write_iter()") but we can't apply that.
CVE-2014-7822
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
[ kamal: port to 3.13-stable: context ]
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'fs/splice.c')
| -rw-r--r-- | fs/splice.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/splice.c b/fs/splice.c index 84f810d63c37..c915e215a50e 100644 --- a/fs/splice.c +++ b/fs/splice.c @@ -1012,13 +1012,17 @@ generic_file_splice_write(struct pipe_inode_info *pipe, struct file *out, struct address_space *mapping = out->f_mapping; struct inode *inode = mapping->host; struct splice_desc sd = { - .total_len = len, .flags = flags, - .pos = *ppos, .u.file = out, }; ssize_t ret; + ret = generic_write_checks(out, ppos, &len, S_ISBLK(inode->i_mode)); + if (ret) + return ret; + sd.total_len = len; + sd.pos = *ppos; + pipe_lock(pipe); splice_from_pipe_begin(&sd); |