Commit d7e3ae47 authored by Ben Hutchings's avatar Ben Hutchings Committed by Jiri Slaby

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 8d020765
("->splice_write() via ->write_iter()") but we can't apply that.

CVE-2014-7822
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
[ kamal: port to 3.13-stable: context ]
Signed-off-by: default avatarKamal Mostafa <kamal@canonical.com>
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
parent 43bf73e1
......@@ -2448,9 +2448,7 @@ static ssize_t ocfs2_file_splice_write(struct pipe_inode_info *pipe,
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,
};
......@@ -2460,6 +2458,12 @@ static ssize_t ocfs2_file_splice_write(struct pipe_inode_info *pipe,
out->f_path.dentry->d_name.len,
out->f_path.dentry->d_name.name, len);
ret = generic_write_checks(out, ppos, &len, 0);
if (ret)
return ret;
sd.total_len = len;
sd.pos = *ppos;
pipe_lock(pipe);
splice_from_pipe_begin(&sd);
......
......@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment