diff options
| author | Changli Gao <xiaosuo@gmail.com> | 2009-11-04 09:09:52 +0100 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-11-04 09:09:52 +0100 |
| commit | cc56f7de7f00d188c7c4da1e9861581853b9e92f (patch) | |
| tree | 4794c8e5b7c7aec176f695dfc9d723d4a73e3ba9 /fs/read_write.c | |
| parent | f21121cde6e617b90cd03ce083652ca543004dc2 (diff) | |
| download | kernel_samsung_smdk4412-cc56f7de7f00d188c7c4da1e9861581853b9e92f.zip kernel_samsung_smdk4412-cc56f7de7f00d188c7c4da1e9861581853b9e92f.tar.gz kernel_samsung_smdk4412-cc56f7de7f00d188c7c4da1e9861581853b9e92f.tar.bz2 | |
sendfile(): check f_op.splice_write() rather than f_op.sendpage()
sendfile(2) was reworked with the splice infrastructure, but it still
checks f_op.sendpage() instead of f_op.splice_write() wrongly. Although
if f_op.sendpage() exists, f_op.splice_write() always exists at the same
time currently, the assumption will be broken in future silently. This
patch also brings a side effect: sendfile(2) can work with any output
file. Some security checks related to f_op are added too.
Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'fs/read_write.c')
| -rw-r--r-- | fs/read_write.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/read_write.c b/fs/read_write.c index 3ac2898..b7f4a1f 100644 --- a/fs/read_write.c +++ b/fs/read_write.c @@ -826,8 +826,6 @@ static ssize_t do_sendfile(int out_fd, int in_fd, loff_t *ppos, if (!(out_file->f_mode & FMODE_WRITE)) goto fput_out; retval = -EINVAL; - if (!out_file->f_op || !out_file->f_op->sendpage) - goto fput_out; in_inode = in_file->f_path.dentry->d_inode; out_inode = out_file->f_path.dentry->d_inode; retval = rw_verify_area(WRITE, out_file, &out_file->f_pos, count); |